hello world 4
test conflic
Merge branch 'master' of https://github.com/zilchrhythm/GitSampleProject

Conflicts:
	hello.txt
delete test
edit from Sam