pitch free
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/hkbm/tanksimulator/Controller.java
	src/main/java/hkbm/tanksimulator/gui/SimpleGUI.java
	src/main/java/hkbm/tanksimulator/hla/TankSimulatorFederate.java