add sync.egoing
Merge branch 'master' of https://github.com/iamone6/opentutorials_git_iamone
add conflict.egoing
Merge branch 'master' of https://github.com/iamone6/opentutorials_git_iamone

Conflicts:
	index.html