add sync.sanghoon
Merge branch 'master' of https://github.com/alixus/opentutorials_git_sanghoon
add conflict.sanghoon
Merge branch 'master' of https://github.com/alixus/opentutorials_git_sanghoon

Conflicts:
	index.html