lol
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Datenbank/Vokabeln.txt
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Datenbank/Vokabeln.txt