modified gitignore for RubyMine
Merge branch 'hotfix-reset-db'
Merge branch 'master' into feature-progress-model