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
fixed schema conflict
Merge branch 'master' of https://github.com/MollyMoile/burning-airlines