32
31
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/de/git/example/Test.java