Removing a file we don't want tracked
Merge branch 'develop' into feature/Bookshelf
Merge pull request #1 from jconkin/feature/Bookshelf

Feature/bookshelf