add line from develop
change one from feature 2
 second change from feature 2
Merge branch 'features/feature2' into develop
add line form develop
ADd line two from feature1
 add line three
 add line four/five from feature1
line 5 from feature1
Conflicts:
	README
Merge branch 'features/feature1' into develop

Conflicts:
	README
Revert "line 5 from feature1"

This reverts commit 5bc29853f153883e165b04316569722734cc77dd.