initial commit +
updalte gemfile
merge conflicts