search
Merge branch 'master' of https://github.com/tfly2013/SMDProject.git

Conflicts:
	app/views/pages/search.html.erb