Dealing with color spectrum
Merge branch 'master' of https://github.com/mycal-tucker/air-traffic-simulation

Conflicts:
	AirTrafficSimulation/src/DisplayServer.java