merge conflict fixed
Merge branch 'master' of https://github.com/sverro2/WEBS2