messing with flights still
Merge branch 'master' of https://github.com/toodelirious/burning_airlines
trying to fix flights
fixed conflict with main.js