Some changes that I'm not sure what they are.
Merge branch 'master' of https://github.com/JonathanBrenner/PhysicsEngine

Conflicts:
	PhysicsEngine/PhysicsEngine/GameObject.cpp
Fixed your rigidbody shit