Mer amster
hej
Merge branch 'master' into test

Conflicts:
	Master.txt
Hej