s
Merge branch 'master' of https://github.com/naess91/kmom07-10

Conflicts:
	README.md