Lektion 17.12.13
Merge branch 'master' of https://github.com/leedam01/physik-zhaw