Se3 Logik 1, 2, 3.1, 3.2 finished
Merge branch 'master' of https://github.com/Nukesor/uni