Basic object displaying
Basic object displaying
Merge branch 'master' of https://github.com/JonathanBrenner/PhysicsEngine

Conflicts:
	.gitignore