Update README.md
Merge branch 'develop' of https://github.com/oyvindfo/feature1 into develop

# By oyvindfo
# Via oyvindfo
* 'develop' of https://github.com/oyvindfo/feature1:
  Update README.md
Merge branch 'feature/test1' into develop

* feature/test1:
  Test

Conflicts:
	README.md