Modified thorns + some small fixes
Merge branch 'master' of https://github.com/Skjortan/lab3