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
Add flight model
Merge pull request #6 from MollyMoile/marcus

Reservation model
Merge pull request #5 from MollyMoile/dev_luke

Dev luke
cleaned up shoulda gems
test
Merge pull request #8 from MollyMoile/marcus

Marcus
Added RSpec Validations and Regular Expressions using Shoulda format
Fixed conflict with schema

Merge branch 'master' into dev_luke

Conflicts:
	db/schema.rb
Added User Validations with 22 OFF RSpec Tests Passed. Added Warden