marathon search 1
Merge branch 'master' of https://github.com/cosc617g4/project

Conflicts:
	app/views/search/_form.html.erb
	app/views/search/index.html.erb
marathon search 2