nothing changed
regular updates
add kill code
v1.1.0.2 dishou
add killbigsum
tips add
add three code
nothing changed
Merge tag 'version1.1.0.5'

Conflicts:
	Welfare.sdf
	Welfare.v11.suo
	Welfare/Release/Welfare.res
	Welfare/Welfare_h.h
	Welfare/Welfare_i.c