TEST
Merge branch 'master' of https://github.com/pschmitt/hochschulsport

Conflicts:
	README.md
Merge branch 'master' of https://github.com/pschmitt/hochschulsport
TEST
Test
Merge branch 'master' of https://github.com/pschmitt/hochschulsport.git