asd
Merge branch 'master' of https://github.com/dastraibeli/Vokabeltrainer

Conflicts:
	.gitignore