PyCharm Project commit
PyCharm Project commit
Merge branch 'master' of https://github.com/geowurster/GeospatialDataManagement
Pushing dotfiles

Conflicts:
	.idea/GeospatialDataManagement.iml
	.idea/misc.xml
	.idea/workspace.xml