Need to clean this crap up
Merge branch 'master' of github.com:seivan/SHAlert