Added documentation for alarm types
Merging laptop version with this one

Merge branch 'master' of https://github.com/smurphy8/alarm-service