test
Update 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
Update README.md
no message
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
no message
Update 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
Merge branch 'develop' into feature/test2

* develop:
  Test
Merge branch 'develop' into feature/test2

* develop:
  Update README.md

Conflicts:
	README.md
cxcx
Merge branch 'develop' into feature/test2

* develop:
  Update README.md

Conflicts:
	README.md
Commit 2
Merge branch 'feature/test2' into develop

* feature/test2:
  Commit 2
  cxcx
  Update README.md
  no message
  no message
  Update README.md
  Update README.md
  test