add confilct.sangkle
Merge branch 'master' of https://github.com/cwoong/opentutorials_git_cwoong

Conflicts:
	index.html