Collision detection with a point.
Merge branch 'master' of https://github.com/JonathanBrenner/PhysicsEngine

Conflicts:
	PhysicsEngine/PhysicsEngine/CollisionDetection.cpp
	PhysicsEngine/PhysicsEngine/main.cpp