laga db
conflict - sorry ef ég rugla
Merge branch 'master' of https://github.com/eddabjork/hugbverkefni1