bot resource
Merge branch 'master' of https://github.com/bleujin/talkserver.git

Conflicts:
	bot/dice.script