Added collision detection
Merge branch 'feature/gameSimulation' of https://github.com/walkon23/two into HEAD

Conflicts:
	module/src/main/java/pl/agh/edu/Simulator.java

Becase I forgot to push it yesterday...
Small fix