ändring1
dfg
Merge branch 'master' into branch2
sds
Merge branch 'master' into branch2
sdsd
sdsd
Merge branch 'branch2'

Conflicts:
	nyfil.txt
ny ändrgin
sd
summary