sync.egoing add
Merge branch 'master' of https://github.com/backback2/opentutorials_git_backback2
add conflict.egoing
Merge branch 'master' of https://github.com/backback2/opentutorials_git_backback2

Conflicts:
	index.html