Add your name.
Merge branch 'master' of github.com:lbx6z/git-test-lz

Conflicts:
	hi.txt