thorgeir is paranoid
Merge branch 'master' of https://github.com/geirmj11/ARTI-Prog2