Merged branches and fixed Gemfile