add sync.cwoong
Merge branch 'master' of https://github.com/cwoong/opentutorials_git_cwoong
add confilct.cwoong