2b-working
Merge branch 'master' of https://github.com/haukurr11/fmal_skil2