Test
Merge branch 'feature/test1' into develop

* feature/test1:
  Test

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

* feature/test2:
  Update README.md
  Test2
no message
Merge branch 'develop' into feature/test2

* develop:
  Test