Added collision check to moveShip() methods
Merge remote-tracking branch 'origin/gamelogic-sprint3' into gui-sprint3
Bugfix for collision detection
Merge remote-tracking branch 'origin/gamelogic-sprint3' into gui-sprint3
Another bugfix for collision detection
Merge remote-tracking branch 'origin/gamelogic-sprint3' into gui-sprint3
Fixed some issues related with the merge