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

Conflicts:
	TinyThief/Debug/TinyThief.exe
	TinyThief/Debug/TinyThief.ilk
	TinyThief/Debug/TinyThief.pdb
	TinyThief/TinyThief.sdf
	TinyThief/TinyThief.v11.suo
	TinyThief/TinyThief/Debug/TinyThief.Build.CppClean.log
	TinyThief/TinyThief/Debug/TinyThief.lastbuildstate
	TinyThief/TinyThief/Debug/TinyThief.log
	TinyThief/TinyThief/Debug/TinyThief.write.1.tlog
	TinyThief/TinyThief/Debug/link.command.1.tlog
	TinyThief/TinyThief/Debug/link.read.1.tlog
	TinyThief/TinyThief/Debug/link.write.1.tlog
	TinyThief/TinyThief/Debug/main.obj
	TinyThief/TinyThief/Debug/rc.command.1.tlog
	TinyThief/TinyThief/Debug/rc.read.1.tlog
	TinyThief/TinyThief/Debug/rc.write.1.tlog
	TinyThief/TinyThief/Debug/rsrc.res
Merge branch 'master' of https://github.com/GrassSunFlower/TinyThief
Merge branch 'master' of https://github.com/GrassSunFlower/TinyThief
no message