Added quite a bit to the Contact class.
All of the collision stuff in there but some niggling errors :(
Now just need to modify numbers.
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/CollisionObject.h
	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/cl.command.1.tlog
	source/ogregraphics/Debug/link.1756-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.1756-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.1756.read.1.tlog
	source/ogregraphics/Debug/link.1756.write.1.tlog
	source/ogregraphics/Debug/link.1940-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.1940-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.1940.read.1.tlog
	source/ogregraphics/Debug/link.1940.write.1.tlog
	source/ogregraphics/Debug/link.2460-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.2460-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.2460.read.1.tlog
	source/ogregraphics/Debug/link.2460.write.1.tlog
	source/ogregraphics/Debug/link.3212-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.3212-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.3212.read.1.tlog
	source/ogregraphics/Debug/link.3212.write.1.tlog
	source/ogregraphics/Debug/link.3260-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.3260-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.3260.read.1.tlog
	source/ogregraphics/Debug/link.3260.write.1.tlog
	source/ogregraphics/Debug/link.4108-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.4108-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.4108.read.1.tlog
	source/ogregraphics/Debug/link.4108.write.1.tlog
	source/ogregraphics/Debug/link.4160-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.4160-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.4160.read.1.tlog
	source/ogregraphics/Debug/link.4160.write.1.tlog
	source/ogregraphics/Debug/link.4964-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.4964-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.4964.read.1.tlog
	source/ogregraphics/Debug/link.4964.write.1.tlog
	source/ogregraphics/Debug/link.5088-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.5088-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.5088.read.1.tlog
	source/ogregraphics/Debug/link.5088.write.1.tlog
	source/ogregraphics/Debug/link.5200-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.5200-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.5200.read.1.tlog
	source/ogregraphics/Debug/link.5200.write.1.tlog
	source/ogregraphics/Debug/link.5244-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.5244-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.5244.read.1.tlog
	source/ogregraphics/Debug/link.5244.write.1.tlog
	source/ogregraphics/Debug/link.5464-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.5464-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.5464.read.1.tlog
	source/ogregraphics/Debug/link.5464.write.1.tlog
	source/ogregraphics/Debug/link.5716-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.5716-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.5716.read.1.tlog
	source/ogregraphics/Debug/link.5716.write.1.tlog
	source/ogregraphics/Debug/link.5928-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.5928-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.5928.read.1.tlog
	source/ogregraphics/Debug/link.5928.write.1.tlog
	source/ogregraphics/Debug/link.5960-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.5960-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.5960.read.1.tlog
	source/ogregraphics/Debug/link.5960.write.1.tlog
	source/ogregraphics/Debug/link.6056-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.6056-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.6056.read.1.tlog
	source/ogregraphics/Debug/link.6056.write.1.tlog
	source/ogregraphics/Debug/link.6292-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.6292-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.6292.read.1.tlog
	source/ogregraphics/Debug/link.6292.write.1.tlog
	source/ogregraphics/Debug/link.6412-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.6412-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.6412.read.1.tlog
	source/ogregraphics/Debug/link.6412.write.1.tlog
	source/ogregraphics/Debug/link.6652-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.6652-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.6652.read.1.tlog
	source/ogregraphics/Debug/link.6652.write.1.tlog
	source/ogregraphics/Debug/link.7336-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.7336-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.7336.read.1.tlog
	source/ogregraphics/Debug/link.7336.write.1.tlog
	source/ogregraphics/Debug/link.8428-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.8428-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.8428.read.1.tlog
	source/ogregraphics/Debug/link.8428.write.1.tlog
	source/ogregraphics/Debug/link.8540-cvtres.read.1.tlog
	source/ogregraphics/Debug/link.8540-cvtres.write.1.tlog
	source/ogregraphics/Debug/link.8540.read.1.tlog
	source/ogregraphics/Debug/link.8540.write.1.tlog
	source/ogregraphics/Debug/link.command.1.tlog
	source/ogregraphics/Debug/link.read.1.tlog
	source/ogregraphics/Debug/link.write.1.tlog
	source/ogregraphics/Debug/ogregraphics.write.1.tlog
	source/ogregraphics/Debug/stdafx.obj
	source/ogregraphics/Debug/vc100.idb
	source/ogregraphics/Debug/vc100.pdb
	source/ogregraphics/IObject.cpp
	source/ogregraphics/TargetObject.cpp
	source/ogregraphics/ogregraphics.vcxproj.filters
	source/ogregraphics/stdafx.h