finish search function by jitongming
Merge branch 'guan'

Conflicts:
	app/controllers/welcome_controller.rb
Merge pull request #1 from JasonGuanGitHub/master

update from Jason