Fix Files

fixer
Merge branch 'master' of https://github.com/jbaird42/Aerodock

Conflicts:
	app/Model/Flight.php
	app/View/Flights/index.ctp