did some collider stuff?
Merge branch 'master' of https://github.com/asidhu/phys-game

Conflicts:
	PhysicsForDummies/PhysicsEngine/Source/collider.cpp