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 'develop' into feature/test2

* develop:
  Update README.md

Conflicts:
	README.md
Merge branch 'feature/test2' of https://github.com/oyvindfo/feature1 into feature/test2

# By oyvindfo
# Via oyvindfo
* 'feature/test2' of https://github.com/oyvindfo/feature1:
  Update README.md

Conflicts:
	README.md