Merge branch 'master' of https://github.com/fffonion/RoameBot.git

Conflicts:
	Readme.md
Merge branch 'master' of https://github.com/fffonion/RoameBot.git