Error collisionclass fixed
Merge branch 'master' of https://github.com/filipcarlen/ooproj-18

Conflicts:
	src/utils/CollisionDetection.java