Added discussion and recommendation things
Merge branch 'master' of https://github.com/rcchen/alexandria

Conflicts:
	app/views/books/view.html.erb
Switch to haml for new page