only responds to certain users
infinite merge conflicts

Merge branch 'master' of https://github.com/cbhl/pennapps13s