Merge origin/master

Conflicts:
	src/project/Game.java
	src/project/Ship.java
Merge origin/master