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

Feature/bookshelf
Merge pull request #2 from jconkin/develop

Develop