Work on minimap
Merge branch 'master' of https://github.com/Team-Innis/Minecart

Conflicts:
	Project/source/GameScene.cpp