private.txt bætt við
Merge branch 'master' into arnar-master
Merge branch 'master' into arnar-master