stuff
Merge branch 'master' of https://github.com/Driptap/Alarming
logo, etc.