wip, search
Merge remote-tracking branch 'origin/master' into search

Conflicts:
	app/controllers/search_controller.rb
Merge pull request #3 from Tobscher/search

Search