Merge branch 'master' of https://github.com/Topgun122104/SeniorProj

Conflicts:
	Game/Game/Debug/Game.exe
	Game/Game/Debug/Game.ilk
	Game/Game/Debug/Game.pdb
	Game/Game/Game.sdf
	Game/Game/Game.v12.suo
	Game/Game/Game/Debug/DXApp.obj
	Game/Game/Game/Debug/Game.log
	Game/Game/Game/Debug/Game.obj
	Game/Game/Game/Debug/Game.tlog/CL.read.1.tlog
	Game/Game/Game/Debug/Game.tlog/CL.write.1.tlog
	Game/Game/Game/Debug/Game.tlog/cl.command.1.tlog
	Game/Game/Game/Debug/Game.tlog/link.command.1.tlog
	Game/Game/Game/Debug/Game.tlog/link.read.1.tlog
	Game/Game/Game/Debug/Game.tlog/link.write.1.tlog
	Game/Game/Game/Debug/Main.obj
	Game/Game/Game/Debug/vc120.idb
	Game/Game/Game/Debug/vc120.pdb
	Game/Game/Game/Game.cpp
Merge branch 'master' of https://github.com/Topgun122104/SeniorProj