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

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

Conflicts:
	RoameBot.exe
	RoameBot.py