Oppdateret readme
Merge branch 'master' of https://github.com/StefanRvO/TestRepo

Conflicts:
	README.md