...
Merge branch 'master' of https://github.com/BPfuelb/Bachelorprojekt

Conflicts:
	Quiz it/Decks/Allgemeinwissen.bin
Merge branch 'master' of https://github.com/BPfuelb/Bachelorprojekt

Conflicts:
	Quiz it/Decks/Allgemeinwissen.bin