Added some exceptions
Merge branch 'master' of https://github.com/SjurdurS/CalendarSystem.git