Removed Alarm Button
Fixed Conflicts
Added Files
Merge pull request #25 from mschaddel/master

Removed Alarm button