add sync.egoing
Merge branch 'master' of https://github.com/egoing/opentutorials_git_egoing
add confict.egoing
Merge branch 'master' of https://github.com/egoing/opentutorials_git_egoing

Conflicts:
	index.html