Building plane specs, adding fixtures
Re-did airplane model, added controller and views, tests, added factorygirl gem for fixtures
fixed conflicts
created seeds file with 1 reservation
Merge pull request #11 from MollyMoile/sambox

Sambox
backbone folders and asset structure
Merge branch 'master' into marcus
test for merging conflict
Merge pull request #13 from MollyMoile/marcus

backbone folders and asset structure
fixed schema conflict
Merge branch 'master' of https://github.com/MollyMoile/burning-airlines
Added FlightsController and Testing
Added Devise Views
Fixed merge conflicts in Schema and Routes

Merge branch 'master' into dev_luke

Conflicts:
	config/routes.rb
	db/schema.rb
homepage, routes, added header with logo, footer
fixed testing explosion
Merge branch 'master' into sambox
Merge pull request #14 from MollyMoile/dev_luke

Dev luke
fixed routes conflict
updated seeds file to suit new migrations