Deleted schema.rb.orig
Editing flight_spec.rb
Merge branch 'master' of github.com:gdomingu/orbitalexpress
edited seating
merged seeds.rb