working / & /search route
Merge branch 'master' of github.com:tippenein/hink

Conflicts:
	app/controllers/docs_controller.rb