edit hello.txt
Merge branch 'master' of github.com:jetaggart/basic-git

Conflicts:
	hello.txt