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
Updates to documentation:  Creation of getting_started, some text in network_storage, TOC updated in the index file.
Merge branch 'develop' of https://github.com/PMEAL/OpenPNM into develop
Testing .gitignore. Leaving things in pending and trying to push.
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
New function in IO called ImportMat.
New folder "Local Files" and an example network for the ImportMat function to play with.
Cleaned up the comments of ImportMat class
Merge branch 'develop' into feature/matIO
Merge branch 'feature/matIO' into develop
Reenabled the add_boundaries step in generic_generate.  It broke a few things, so now coordinates arent' assigned to them.
Update of run_script to work with changes to add_boundaries.  Note that the lattice spacing must be a float (i.e. 1.0)
Fixed and documented the coords labeling of the boundary pores.
made the variables in the invasion percolation algorithm self._var instead of self.var