auto generated files
Merge branch 'master' into dev-alberto
create association between flight and airplane
Merge branch 'master' into dev-alberto

Conflicts:
	db/schema.rb

  The conflict was just related to the version
Create all the associations between resources
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
Merge pull request #15 from MollyMoile/sambox

Sambox - Homepage + nav
devise views, added name field to sign up
Merge pull request #16 from MollyMoile/sambox

devise views, added name field to sign up