nima tuibushangqu!!!
hahah
hkhjkjl
Merge https://github.com/JessenPan/ZYNLPJPT

Conflicts:
	ChaKanKC.aspx
	ChaKanKC.aspx.cs
	Importjs1.aspx.cs
	Importxs1.aspx.cs
	Utility/DbHelperSQL.cs
	XiuGaiKC.aspx
	XiuGaiKC.aspx.cs
	ZYNLPJPT.suo
Merge pull request #24 from zhaohaojie-git/master

haojie almost final