whoops, forgot to indent a bit more
fix some git issue
Merge branch 'master' of github.com:aperson/moderator-bot

Conflicts:
	moderator-bot.py