what
Merge branch 'master' of https://github.com/MySchoolConsult/SchulServer24

Conflicts:
	.gitignore