Commented Object class and Mario class
Merge https://github.com/jgavin/donkeykongproject

Conflicts:
	donkeykong/DonkeyKongGame.o
	donkeykong/Object.cpp~
	donkeykong/Object.h
	donkeykong/Object.h~
	donkeykong/liveSave.txt
	donkeykong/main
commented mario and object