sync.egoing 추가
Merge branch 'master' of https://github.com/fronteer-kr/test1
conflict.egoing 추가
Merge branch 'master' of https://github.com/fronteer-kr/test1

Conflicts:
	index.html