Initial commit
Merge branch 'master' of https://github.com/TaperBox/elective-map3d

Conflicts:
	.gitignore