testing this thing - thorhildur
Merge branch 'master' of https://github.com/GunnarSturla/Ti-maverkefni
commit message  lbakj lksdj aslkdj s