second commit
Merge branch 'master' of https://github.com/cirocosta/android-alarm