Feature1-1
Feature1-2
Feature1-3
Merge branch 'develop' into feature/feature1

Conflicts:
	GitTest.txt
Feature1-4
Feature1-5
Merge branch 'develop' into feature/feature1

Conflicts:
	GitTest.txt