sdfsdf
sdfsdf
Merge branch 'master' of https://github.com/AlexKund/git-merges-test
xfsdfsd
Merge branch 'master' of https://github.com/AlexKund/git-merges-test

Conflicts:
	index.html
ok
weerf