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
Merge branch 'master' of https://github.com/PMEAL/OpenPNM into develop