just undid what i broke
Merge branch 'master' of heroku.com:hubot-staging
fixed it
added comments and made code pretty
Merge branch 'master' of heroku.com:hubot-staging
city updates in happyHour, immunity in ambush
Merge branch 'updatedScripts'