Merge pull request #16 from zestos/master

Non-minified bootstrap
popover content, rm null images from index, button colors
popover content, rm null images from index, button colors
Merge branch 'popovermadness'
Merge pull request #17 from margaretblue/master

popover content, rm null images from index, button colors
Fix join table relationships, use relationship in controller, display book in reading list
Merge branch 'work'

merge work branch
Change colors on _book template for reading list
Add button ajax
Merge add button ajax