ETT commit
TVÅ commit i min egen
TRE commit master
Merge branch 'min-egen-branch'

Conflicts:
	test.html
Merge branch 'master' into min-egen-branch