Building plane specs, adding fixtures
Re-did airplane model, added controller and views, tests, added factorygirl gem for fixtures
fixed conflicts
created seeds file with 1 reservation
Merge pull request #11 from MollyMoile/sambox

Sambox
Merge branch 'master' into marcus
test for merging conflict