Progress towards AABB collisions
Merge branch 'master' of https://github.com/Nyrmburk/Physics-Engine

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