This is a commit using notepad++ as the git editor.
Merge branch 'master' of https://github.com/nathant23/test-repo

This is to merge the record that test editors have been set for the mac and PC.

Conflicts:
	testFile.txt