Forces and shiet
Merge branch 'master' of https://github.com/HATtrick-games/ICT312

Conflicts:
	source/Debug/ogregraphics.exe
	source/Debug/ogregraphics.exp
	source/Debug/ogregraphics.lib
	source/Debug/ogregraphics.pdb
	source/ogregraphics/Debug/CL.read.1.tlog
	source/ogregraphics/Debug/CL.write.1.tlog
	source/ogregraphics/Debug/CollisionObject.obj
	source/ogregraphics/Debug/CollisionWorldSingleton.obj
	source/ogregraphics/Debug/DebugDrawer.obj
	source/ogregraphics/Debug/FrameListener.obj
	source/ogregraphics/Debug/Game.obj
	source/ogregraphics/Debug/GenericObject.obj
	source/ogregraphics/Debug/IObject.obj
	source/ogregraphics/Debug/IScene.obj
	source/ogregraphics/Debug/ITBuildingScene.obj
	source/ogregraphics/Debug/OgreBulletDraw.obj
	source/ogregraphics/Debug/OgreGraphics.obj
	source/ogregraphics/Debug/PhysicsEngine.obj
	source/ogregraphics/Debug/ProjectileObject.obj
	source/ogregraphics/Debug/RigidBodyObject.obj
	source/ogregraphics/Debug/SceneLoader.obj
	source/ogregraphics/Debug/SceneManager.obj
	source/ogregraphics/Debug/TargetObject.obj
	source/ogregraphics/Debug/TemporaryPlayerObject.obj
	source/ogregraphics/Debug/TestObject.obj
	source/ogregraphics/Debug/TestScene.obj
	source/ogregraphics/Debug/Vector3.obj
	source/ogregraphics/Debug/link.read.1.tlog
	source/ogregraphics/Debug/ogregraphics.write.1.tlog
	source/ogregraphics/Debug/stdafx.obj
	source/ogregraphics/Debug/vc100.idb
	source/ogregraphics/Debug/vc100.pdb