added search form, broke whole app
added search bar with proper erb format on layout for the time being
t conflicts
Merge branch 'master' into fix_search

Conflicts:
	app/controllers/flights_controller.rb
	app/views/layouts/application.html.erb