initial model implementation
Merge branch 'simons_work'
gemfile.lock
Merge branch 'master' of github.com:citizengit/burning-airlines