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

Conflicts:
	.gitignore