rspec and shouldamatchers gems
fixed conflict with gemfile lock
Merge branch 'master' of https://github.com/MollyMoile/burning-airlines
add reservation model, test is in rspec syntax, not shoulda matcher
Merge pull request #6 from MollyMoile/marcus

Reservation model