dklol
fixing stuff or whatever
Whatevers
Merge branch 'mike' into Seth

Conflicts:
	airport.cpp~
fixed