Mer kul!
Merge branch 'master' into test
Hej
Merge branch 'master' into test

Conflicts:
	Master.txt
Hej
Test2
Merge remote-tracking branch 'origin/test'