main
Merge branch 'master' of https://github.com/thju1011/KneipenApp.git

Conflicts:
	src/de/kneipe/kneipenquartett/ui/main/Main.java