CR1234
CR123
Bug

Conflicts:
	GitSample/src/Master.java
Merge remote-tracking branch 'origin/m1imueller/CR123456'

Conflicts:
	GitSample/src/Master.java