Adds handling of collision to the model
Merge branch 'develop' of https://github.com/CrashIT14/ChalmersSpaceShooter into develop

Conflicts:
	src/lab1/GreenUfo.java
Merge remote-tracking branch 'origin/develop' into develop
Adds collision with player to greenufo