//
Merge branch 'master' of https://github.com/Jasperste/Simulator.git

Conflicts:
	src/mygame/ShipControl.java