That
Merge branch 'master' of https://github.com/zeitzbach2/Git.git

Conflicts:
	PracticeGit/src/hi.java