added lokas stuff
Merge branch 'master' of https://github.com/Adeor/ChemieSchulaufgabe