edit test file
Merge branch 'master' of https://github.com/zilchrhythm/GitSampleProject

Conflicts:
	test1.txt