Merge branch 'master' into marcus
Merge branch 'master' into marcus
Merge pull request #25 from MollyMoile/dev_luke

Dev luke
Merge branch 'master' of https://github.com/MollyMoile/burning-airlines into marcus
formatting
fixed styling on landing page
Merge pull request #26 from MollyMoile/marcus

Marcus
Added Search Flight Feature Working and RSpec
Remember to reset the index of your database with:
rake db:reset