added knack to db and fixed search
Merge branch 'master' of https://github.com/danf425/experiment1friend

Conflicts:
	app/models/space.rb
	app/views/root/root.html.erb