Changes to the formating to look more pretties
Merge remote-tracking branch 'origin/Seth'

Conflicts:
	a.out
	airport.cpp