Code written for importing from mat (OpenPNM.Generators.ImportMat). Still need to document required file formats.
Setup of algorithms.rst file for other's to added their documentation
Committing __Import__ file early on, so that I don't make the same stupid mistake again of not selecting it
Code written, just debugging now.
some bug fixes
Merge branch 'develop' into feature/network_import
tested with IP and VTP generator. seems to work. Merging now
Merge branch 'feature/network_import' into develop
working on adding the import generator to the gui. need to merge first though
Merge branch 'develop' into feature/gui

Conflicts:
	OpenPNM/Generators/__Import__.py
Import almost working, debugging now.