add search
Merge branch 'master' of github.com:brianholderchow/optome

Conflicts:
	Gemfile
	Gemfile.lock