Revert "new collision system added - faster"

This reverts commit 0aebab317912476abedbcfbd18aa1a119021d1d5.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/GamePanel.java