build failure
conflict ves, reyna að resolve-a
Merge branch 'master' of https://github.com/SpiderPigs/sidannarverkefni