creat for search
Merge branch 'master' of https://github.com/jcburke14/dugong

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