upcoming allt dunso
Merge branch 'master' of https://github.com/bjornlogi/Lokaverkefni