Trying to get this working

Didn't change anything
Merge remote-tracking branch 'origin/Greg' into Andrew

Conflicts:
	Debug/Project4.exe
	Debug/Project4.ilk
	Debug/Project4.pdb
	Project4.sdf
	Project4.v12.suo
	Project4/Debug/Camera.obj
	Project4/Debug/Card.obj
	Project4/Debug/Deck.obj
	Project4/Debug/Game.obj
	Project4/Debug/Object.obj
	Project4/Debug/PlayDeck.obj
	Project4/Debug/Player.obj
	Project4/Debug/Project4.log
	Project4/Debug/Project4.tlog/CL.read.1.tlog
	Project4/Debug/Project4.tlog/CL.write.1.tlog
	Project4/Debug/Project4.tlog/link.read.1.tlog
	Project4/Debug/Project4.tlog/link.write.1.tlog
	Project4/Debug/StandardDeck.obj
	Project4/Debug/Texture.obj
	Project4/Debug/World.obj
	Project4/Debug/main.obj
	Project4/Debug/vc120.idb
	Project4/Debug/vc120.pdb