Commit before merging
Merge branch 'dev_1.0' of https://github.com/DaveInvierno/CrazyAlarm into dev_1.0