Thomas commit
Merge branch 'master' of https://github.com/ankaufma/FAQ-Teamprojekt.git