updated studieretninger
merge conflicts resolved