more fixing
Merge branch 'master' of https://github.com/jb38/cs474-simulation

Conflicts:
	src/main/java/edu/hood/cs/sim/Instrumentation.java
	src/main/java/edu/hood/cs/sim/domain/Aircraft.java