manish-1212
manish1212
Merge branch 'master' of https://github.com/cosc617g4/project
Merge branch 'master' of https://github.com/cosc617g4/project
manish-dec14
manish-dec14
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
changed back
change bacl
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
Merge branch 'master' into bandell-branch
added some styling