frantically fixing up search
Merge branch 'master' of github.com:team461WBI/website

Conflicts:
	app/views/layouts/application.html.erb