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
Former-commit-id: fa0f561fc00b17e45d10951b4dafbd870aaacd8f
just trying to remove gitignore. Someone help me


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

Conflicts:
	.gitignore

Former-commit-id: e29ba02644ac2c582ba38b56ce744d7e6053a2d5
Former-commit-id: 6e95587a663cb38179963fd00c08c96331fa3484
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
Former-commit-id: 721941678065406f04ae67fd75538bfb32915541
Linked two documents in doc/userguide/index.rst


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


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


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


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


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


Former-commit-id: f74af58045fa92e5197080a757eb7cb462d1f384
Former-commit-id: f856d91557e5d1d57a246702191ac9212f493cf5
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
Former-commit-id: dab86ca0878016bd64ff3ed894298d61859fbcdb
Merge branch 'master' of https://github.com/PMEAL/OpenPNM into develop


Former-commit-id: a3d0d30ea787edab230aa0096b61bfcf93450c76
Former-commit-id: 0d7c3afc5d1b3e9a5398bb0f03c61b81180d9c6a
Beta 1

Build-up


Former-commit-id: 667a91566f347c84702d0f002e7f3ac2875239ac
Former-commit-id: 271d8613f8f6a413c76ec3c2e1bb1c5dc5a40b28
Better samples


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


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


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


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


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


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


Former-commit-id: dabb96f2f74cfeac3d8079e69d4994ecd5a6255e
Former-commit-id: 58810de5b21e18d9c344a5638ca1ceb3093337aa