Update README.md
Update README.md
Update README.md
Merge remote-tracking branch 'origin/Rolfbranch' into helgebranch

Conflicts:
	README.md