Setting up Gem file (removed syntax error and sdoc)
Fixing merge conflict in Gemfile