just trying to remove gitignore. Someone help me
Merge branch 'master' of https://github.com/PMEAL/OpenPNM

Conflicts:
	.gitignore
still removing gitignore. I think everyone needs to "ignore" gitignore files, so that they can have a local version without messing with eachother's
Updated documentation files. Changed indentation in index.rst
More changes to the documentation
Merge branch 'develop' of https://github.com/PMEAL/OpenPNM into develop

Conflicts:
	docs/userguide/getting_started.rst
	docs/userguide/index.rst
	docs/userguide/network_storage.rst
Merge branch 'master' of https://github.com/PMEAL/OpenPNM into develop
Documentation update: still in progress
Merge branch 'develop' into feature/matIO