joe trolling from brandon

Conflicts:
	bots/bot.js