change in master
Merge branch 'master' of https://github.com/AlexKund/git-merges-test into testbranch

Conflicts:
	index.html