no return
fix bug
add keys
actually do the search
Merge branch 'master' of https://github.com/tadhgpearson/layover

Conflicts:
	app/views/search.scala.html