Editing from both ends: client
edited from client
resolve conflict?
resolve conflict 2?
Merge branch 'master' of https://github.com/theuncommon/hello