Not much but want to work on my desktop
Merge branch 'master' of github.com:thesteve0/shapefileconverter

Conflicts:
	.idea/workspace.xml