add on to hello.txt 2nd computer
Merge branch 'master' of github.com:bscharm/basic-git

Conflicts:
	hello.txt