Updating to most recent, changed makefile and DonkeyKongGame.cpp
M`erge branch 'master' of https://github.com/jgavin/donkeykongproject

Conflicts:
	donkeykong/DonkeyKongGame.o
	donkeykong/main