made change on NewFeature branch
Merge branch 'master' into NewFeature

Conflicts:
	fubar.txt
Merge branch 'NewFeature'