Kevin der Schlunz
Merge branch 'master' of https://github.com/NightDreamer/Kegelverein

Conflicts:
	.gitignore