adding some front end
fixed conflicts
commit
Merge branch 'master' of github.com:TomGroombridge/book_project
Merge branch 'lara'

Conflicts:
	app/assets/javascripts/books.js.coffee
Merge branch 'lara' of github.com:TomGroombridge/book_project