gagnagrunnur.db
merge conflict
Merge branch 'master' of github.com:bjk17/Vefforritun

another merge conflict