add sync.ORG
Merge branch 'master' of https://github.com/lov2the2/opentutorials_git_crazyjune
add conflict.ORG
Merge branch 'master' of https://github.com/lov2the2/opentutorials_git_crazyjune

Conflicts:
	index.html