Math eqautions
Merge branch 'dev' of https://github.com/Softwareprojekt/Sisyphus into dev