useless commit
commit resolved conflict
Merge branch 'master' of https://github.com/thorsteinnth/raudirhestar_spilavefur