rettet ass5
Merge branch 'master' of https://github.com/skrogh/02155
lab5 ass2