updated gemfile, controllers and models
Merge branch 'master' of github.com:toodelirious/burning_airlines