Flight Edits

Conflicts:
	index.html
plane changes