Change readme.md
Merge branch 'master' of https://github.com/oyvind-kjerland/REPO

Conflicts:
	README.md