Rebased the projec to fix build
Merge branch 'master' of https://github.com/piaoasd123/IMGD3000PROJ2

Conflicts:
	Project2/src/game.cpp