hotfix 100
Merge branch 'hotfix100'

Conflicts:
	GitExample/src/GitExample.java