Merge branch 'develop'
Merge Chapter 5 Finished
gitignore updated for idea
gemfile updated for windows