Zwischenstand
Merge branch 'master' of https://github.com/klandolt/Java-Quize

Conflicts:
	.gitignore
Zwischenstand