Derp
Merge branch 'master' of https://github.com/gormur/Hugbunadarverkefni_hv1