+an empty line
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
cleaning
Merge branch 'master' of https://github.com/kvv20/repo1

Conflicts:
	index.html