Please don't commit .gitignore. It needs to stay local and specific to each PC. <I think>
Merge branch 'master' of https://github.com/PMEAL/OpenPNM into develop

Conflicts:
	.gitignore

Former-commit-id: 6ed7992f97e7f5395c8f5cc9dd2dae768a536199
just trying to remove gitignore. Someone help me


Former-commit-id: e09284e365f463412531a8b70e9fe65b7e87eecf
Merge branch 'master' of https://github.com/PMEAL/OpenPNM

Conflicts:
	.gitignore

Former-commit-id: e29ba02644ac2c582ba38b56ce744d7e6053a2d5
still removing gitignore. I think everyone needs to "ignore" gitignore files, so that they can have a local version without messing with eachother's


Former-commit-id: a4c5338c00470d530e772133b9848596876d1fd4
Linked two documents in doc/userguide/index.rst


Former-commit-id: e0154f6b9f331555f1d32f402c76e86710a3cfc2
Updates to documentation:  Creation of getting_started, some text in network_storage, TOC updated in the index file.


Former-commit-id: 3b1771c67cceac3d8a2c488566c5c98b5a654a3b
Merge branch 'develop' of https://github.com/PMEAL/OpenPNM into develop


Former-commit-id: 922e0a77d6713e6c2d07c5823aef88f57c3c4924
Testing .gitignore. Leaving things in pending and trying to push.


Former-commit-id: 3a0d1a090d51bc2603503b1d1dba407bf8e381b8
Updated documentation files. Changed indentation in index.rst


Former-commit-id: d146c589e0056a78ac82f110702baa04766c5c7b
More changes to the documentation


Former-commit-id: f74af58045fa92e5197080a757eb7cb462d1f384
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

Former-commit-id: 8d7335f92fdf1855e4671d0421c29f5d85e73df9
Merge branch 'master' of https://github.com/PMEAL/OpenPNM into develop


Former-commit-id: a3d0d30ea787edab230aa0096b61bfcf93450c76
Beta 1

Build-up


Former-commit-id: 667a91566f347c84702d0f002e7f3ac2875239ac
Better samples


Former-commit-id: 6d888325b1d6d90d21d789e76865731000673003
Documentation update: still in progress


Former-commit-id: f2085422ac0d1706ee3f06a336f07d3470e93445
New function in IO called ImportMat.


Former-commit-id: 783c82b5cdf2c6135f413ce6d90e0388ca51cf4a
New folder "Local Files" and an example network for the ImportMat function to play with.


Former-commit-id: 7e76393c8990ff12eaae5173cbac84d717448db3
Cleaned up the comments of ImportMat class


Former-commit-id: fc8083f6c9111eb282c0821f6f87b4aeb988990b
Merge branch 'develop' into feature/matIO


Former-commit-id: 8f3eb08df798dad0405c9836a26dabd7e19eba8d
Merge branch 'feature/matIO' into develop


Former-commit-id: dabb96f2f74cfeac3d8079e69d4994ecd5a6255e