Calendar update
Merge branch 'master' of https://github.com/NordhHelander/GBSU14_Grupptenta2.git