Changes in second feature
Second feature second change
Change in develop
Merge branch 'feature/SecondFeature' into develop

Conflicts:
	FirstFile.txt
Solved