add conflict.lovekmg
Merge branch 'master' of https://github.com/lovekmg/opentutorials_git_lovekmg

Conflicts:
	index.html