Minor changes
Merging
Change
Merge branch 'master' of https://github.com/yudasinal/alarmapp