here comes the differences
Merge branch 'master' of github.com:hillrw3/basic-git

Conflicts:
	hello.txt