Merge pull request #15 from JasonLev/master

Add splash page and two rspec tests
Non-minified bootstrap
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
Merge pull request #18 from zestos/master

Add button ajax
Working add + delete from list
Merge branch 'bookuser'
Merged working add and delete
Merge pull request #19 from zestos/master

Working add + delete button
revision of splash page; one rspec fix
revsion to splash; rspec fix
Merge branch 'more_splash'
revision to splash