Organisering

bilder i bildemappa
kalender update
Merge branch 'master' of https://github.com/JoakimT/prosjekt