Oh no merge conflicts!!
Merge branch 'master' of github.com:sukhada/15239

Conflicts:
	TheGame/scenes/MapOverlay.js
	TheGame/scenes/MapParent.js
Merge branch 'master' of github.com:sukhada/15239