Changed colision test from main method
Merge branch 'master' of https://github.com/bangerius/ExtremePutting2

Conflicts:
	ExtremePutting2/src/PhysicsEmulator.java