Kommentar
Merge branch 'master' of https://github.com/bhegmanns/gittest.git

Conflicts:
	gittest/src/de/hegmanns/zaehler/Zaehler.java