Conflict issue fix
nnn
Merge branch 'master' of https://github.com/andrewdex/dalert.git
Fixed another conflict :)
Merge pull request #2 from andrewdex/gh-pages

Merge pull request #1 from andrewdex/master
Merge pull request #3 from andrewdex/master

pull for updates