Github is acting up again(again)
Conflict resolution attempt

Conflicts:
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/Enemy.obj
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/EnemyManager.obj
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/TemplateProject.exe
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/TemplateProject.exp
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/TemplateProject.lib
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/TemplateProject.log
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/TemplateProject.pdb
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/TemplateProject.tlog/CL.read.1.tlog
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/TemplateProject.tlog/CL.write.1.tlog
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/TemplateProject.tlog/TemplateProject.write.1u.tlog
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/TemplateScene.obj
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/Turret.obj
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/main.obj
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/vc120.idb
	UtH-EngineVS2013/VS2013/TemplateProject/Debug/vc120.pdb
	UtH-EngineVS2013/VS2013/TemplateProject/TemplateProject.sdf
	UtH-EngineVS2013/VS2013/TemplateProject/TemplateProject.v12.suo
	UtH-EngineVS2013/VS2013/TemplateProject/TemplateScene.cpp
	UtH-EngineVS2013/VS2013/TemplateProject/Turret.cpp