Merge branch 'master' of github.com:mosquito242/wewrite into followingUsers
removed gemfile.lock merge conflict message