Update gitignore to have ruby-version file
Merge branch 'master' into develop