Test
Merge branch 'master' of https://github.com/studerus/Jassstatistik

Conflicts:
	README.md