Merging to master branch
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git

Conflicts:
	minimap.png