Merge branch 'master' of https://github.com/cgrin/zuStatus
Merge branch 'master' of https://git.heroku.com/desolate-badlands-8639