editing the layouts for the seach
Merge branch 'master' of https://github.com/cosc617g4/project

Conflicts:
	app/views/layouts/application.html.erb
	app/views/search/_form.html.erb
putting the search together