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
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
amdouglas/OpenPNM,amdouglas/OpenPNM,stadelmanma/OpenPNM,TomTranter/OpenPNM,PMEAL/OpenPNM