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 pull request #8 from MollyMoile/marcus

Marcus
Merge branch 'master' of https://github.com/MollyMoile/burning-airlines
Merge branch 'master' into sambox
Added RSpec Validations and Regular Expressions using Shoulda format
airplane model
Fixed conflict with schema

Merge branch 'master' into dev_luke

Conflicts:
	db/schema.rb
removed seat column from reservations
removed flight column form reservations
Merge pull request #9 from MollyMoile/sambox

Sambox
added seat id column to reservations
Added User Validations with 22 OFF RSpec Tests Passed. Added Warden
fixed conflicts on reservation model