models and controllers
latest merge

Merge branch 'master' of https://github.com/albertjou/burningairlines