Add some mass
Merge branch 'collisions' into ship_collisions

Conflicts:
	src/engineTester/MainGameLoop.java
	src/entities/Entity.java
	src/physics/PhysicsUtilities.java