Added Mac specific file to gitignore
Merge branch 'develop' of https://github.com/phikes/bookstore into develop
Update bookstore-rails to newest version