accidentally changed database yml file, changed back
Merge branch 'master' into sambox
Merge branch 'master' into sambox
Merge branch 'master' into sambox
airplane model initial data
Merge branch 'master' into sambox
fixed schema conflict, resercations
Merge branch 'master' into sambox
Merge branch 'master' of https://github.com/MollyMoile/burning-airlines
Merge branch 'master' into sambox
airplane model
removed seat column from reservations
removed flight column form reservations
Merge pull request #9 from MollyMoile/sambox

Sambox
added seat id column to reservations
Building plane specs, adding fixtures
auto generated files
Merge branch 'master' into dev-alberto
fixed conflicts on reservation model
create association between flight and airplane