kristjan sett inn var bla 1000
Merge branch 'master' of https://github.com/haftor2410/temp.git