HI
ABC
Merge branch 'feature/newtestfeature' into develop

* feature/newtestfeature:
  ABC

Conflicts:
	README.md
hi
Merge branch 'release/newfeat2'

* release/newfeat2:
  hi
  ABC
  HI