Merge remote-tracking branch 'upstream/master' into settings
Added simplecov to get coverage statistics
Add tests for books controller
Merge pull request #41 from cndreisbach/testing

Improve testing
Merge pull request #37 from ernbrn/settings

Settings
Tightened up settings
deleted _settings.html.erb