spec views edited
gemfile changed
modified app specs to pass the tests written
modified spec controllers to fix the tests created by the generator
rspec file
fixed merge conflict in the app models flight and reservation
Merge pull request #6 from fedetaglia/em_dev

Fixed the specs that the generator made