update
fixed merge
Merge branch 'development'
pushing up models and migrations
creating models and migrations
commit
Merge branch 'master' of https://github.com/rlee1121/virgin_airlines
working on plane index
planes stuff done