working on feature 4
Feature 4 done
Feature 5
Feature5 done
Merge branch 'release-0.1' into develop
Add new feature
Update README file
Change in develop branch
Change in newfeature branch
Merged 'develop'.

Conflicts:
	FirstFile.txt
Finish NewFeature