new code
code
Merge branch 'mmueller/CR_123'

Conflicts:
	HelloGit/src/HelloGit.java