no message
Merge branch 'master' of https://github.com/GrassSunFlower/TinyThief

Conflicts:
	TinyThief/TinyThief/Global.inc
Merge branch 'master' of https://github.com/GrassSunFlower/TinyThief
no message