Temp commit
temp removed conflicting Gemfile
recovering correct gemfile