my gemfile changes based on my vesion bump
Merge branch 'master' into develop