Reworked loader and alll around changes
Merge branch 'master' of https://github.com/Nyrmburk/Physics-Engine

Conflicts:
	src/physics/Collision.java