add conflict by clone
Merge branch 'master' of https://github.com/hirumiran/first-git-miran

Conflicts:
	index.html