sync 추가
Merge branch 'master' of https://github.com/kangzerg/opentutorials_git_kangzerg
add conflict egoing
Merge branch 'master' of https://github.com/kangzerg/opentutorials_git_kangzerg

Conflicts:
	index.html