Added more to the file from the master.
Added more to file from the branch.
Merge branch 'master' into newFeature

Conflicts:
	firstFile.txt