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