Add new feature
Change in develop branch
Change in newfeature branch
Merged 'develop'.

Conflicts:
	FirstFile.txt
Finish NewFeature