More progress on collisions

Ended up connecting some things the way they are supposed to.
Merge branch 'master' of https://github.com/Nyrmburk/Physics-Engine

Conflicts:
	src/com/Entity.java
	src/com/GameEngine.java
	src/com/Manager.java
	src/physics/Collision.java

Conflict resolution