changed navbar for the time being. added search bar
added margin to nav bar buttons
Merge branch 'flights_index'
t do it

Conflicts:
	app/assets/stylesheets/style.css
	app/views/layouts/application.html.erb