just testing different scenarios, nothing important
just merge issues. grr
Merge branch 'master' of https://github.com/mycal-tucker/air-traffic-control

Conflicts:
	Air Traffic Control/.gitignore
	Air Traffic Control/src/DisplayServer.java