merge conflicts
make private profile
psuedo code for book page cta
merge commits
Merge branch 'friendly-forwarding'

Conflicts:
	app/controllers/books_controller.rb