maps read from files
Merge branch 'master' of https://github.com/JamesLaskey/ShadowTag

Conflicts:
	.gitignore