working on the search function
Merge branch 'master' of github.com:Ja-Querie/books

Conflicts:
	app/assets/javascripts/search.js
	app/views/books/index.html.haml