다시 sync.egoing 수정
Merge branch 'master' of https://github.com/yskong/opentutorials_git_yhkong
conflict.egoing 추가
Merge branch 'master' of https://github.com/yskong/opentutorials_git_yhkong

Conflicts:
	index.html