Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev

Conflicts:
	.coveragerc
	.gitignore
	.travis.yml
	docs/api_Utils.rst
	docs/conf.py
	docs/index.rst
	requirements.txt
	setup.py
This commit is contained in:
Rowan Cockett
2015-11-04 09:59:11 -08:00
37 changed files with 5141 additions and 0 deletions
+1
View File
@@ -0,0 +1 @@
import CylInversion