,comments,..

buinn að bæta eitthvað comments inn
conflict leyst
Merge branch 'master' of https://github.com/BjornBjarnsteins/SpiderMaster-3000