aftur
Merge branch 'master' of https://github.com/steinunn8/THH-Hopverkefni-2