blabla
gaga
Merge branch 'master' of https://github.com/Kaninsokk/SKSFinal
nye filer blabla litt endringer
merged, alt går via basecontroller