Merge origin/master

Conflicts:
	src/project/Game.java
	src/project/Ship.java
Merge branch 'master' of https://github.com/seth12619/Project