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
Merge pull request #14 from MollyMoile/dev_luke

Dev luke