add sync.drogvory
Merge branch 'master' of https://github.com/drogvory/testgit
add conflict.drogvory
Merge branch 'master' of https://github.com/drogvory/testgit

Conflicts:
	index.html