add conflict.egoing
Merge branch 'master' of https://github.com/sehopark/opentutorials_git_sehopark

Conflicts:
	Index.html