An edit to a line of little significance
Merge branch 'master' of https://github.com/InspiredOne/TestRepo

Conflicts:
	someFile