add sync.dev
Merge branch 'master' of https://github.com/pyosoks/test_git
add conflict.dev
Merge branch 'master' of https://github.com/pyosoks/test_git

Conflicts:
	index.html