Adding new feature on separate development branch
Merge branch 'master' into NewFeature

Conflicts:
	source/ASecondFile.txt
Merging files