igonor same files
commit
Merge branch 'master' of https://github.com/taojiangcb/GameTools

Conflicts:
	FStarlingTool/bin-debug/FStarlingTool.swf
	GStarling/bin/GStarling.swc