Merge branch 'master' of https://github.com/anthgithub/Down-with-DIEgo

Conflicts:
	ICS4U1 Platformer/Down with DIEGO/Debug/Down with DIEGO.exe
	ICS4U1 Platformer/Down with DIEGO/Debug/Down with DIEGO.ilk
	ICS4U1 Platformer/Down with DIEGO/Debug/Down with DIEGO.pdb
	ICS4U1 Platformer/Down with DIEGO/Down with DIEGO.suo
	ICS4U1 Platformer/Down with DIEGO/Down with DIEGO/Debug/CL.read.1.tlog
	ICS4U1 Platformer/Down with DIEGO/Down with DIEGO/Debug/CL.write.1.tlog
	ICS4U1 Platformer/Down with DIEGO/Down with DIEGO/Debug/Down with
DIEGO.lastbuildstate
	ICS4U1 Platformer/Down with DIEGO/Down with DIEGO/Debug/Down with
DIEGO.log
	ICS4U1 Platformer/Down with DIEGO/Down with
DIEGO/Debug/cl.command.1.tlog
	ICS4U1 Platformer/Down with DIEGO/Down with
DIEGO/Debug/link.command.1.tlog
	ICS4U1 Platformer/Down with DIEGO/Down with
DIEGO/Debug/link.read.1.tlog
	ICS4U1 Platformer/Down with DIEGO/Down with
DIEGO/Debug/link.write.1.tlog
	ICS4U1 Platformer/Down with DIEGO/Down with DIEGO/Debug/main.obj
	ICS4U1 Platformer/Down with DIEGO/Down with
DIEGO/Debug/mt.command.1.tlog
	ICS4U1 Platformer/Down with DIEGO/Down with DIEGO/Debug/mt.read.1.tlog
	ICS4U1 Platformer/Down with DIEGO/Down with DIEGO/Debug/mt.write.1.tlog
	ICS4U1 Platformer/Down with DIEGO/Down with DIEGO/Debug/vc100.idb
	ICS4U1 Platformer/Down with DIEGO/Down with DIEGO/Debug/vc100.pdb
	ICS4U1 Platformer/Down with DIEGO/Down with DIEGO/Player.h
	ICS4U1 Platformer/Down with DIEGO/Down with DIEGO/main.cpp