add n:n relationchip for users and books, configure user stuff to work with new layout, add additional files
Merge remote-tracking branch 'origin/master'

Conflicts:
	BookPlus/app/views/layouts/application.html.erb
add additional files