Alarms new function names, and semicolons in other files.
Merge branch 'master' of https://github.com/Cup-a-SEP/OVAlarm
Semicolons + update alarms
Merge branch 'master' of https://github.com/Cup-a-SEP/OVAlarm