git sucks
Merge branch 'master' of github.com:mlschmidt/projectCourse

Conflicts:
	eSim/src/main/java/dk/dma/esim/simulation/Simulation.java
Cleaned up some Java. Added primitive movement of AIS-based ships.