Merge branch 'OwenCode' into StefanCode

Conflicts:
	T3/Main.cpp
	T3/Main.h
	T3/Player.cpp
	T3/Player.h
	T3/Projectile.cpp
	T3/Projectile.h
	T3/T3.vcxproj
	T3/T3.vcxproj.filters
	T3/TextureManager.cpp
	T3/TextureManager.h
Merge branch 'StefanCode'
Fixed conflicts.
Merge branch 'StefanCode'