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

Conflicts:
	app/assets/javascripts/search.js.coffee