working map
Merge branch 'master' of https://github.com/bbbgscott/Black_Thorn

Conflicts:
	src/com/ideoma/black_thorn/MainActivity.java