M&A
Merge pull request #5 from AoteChou/master

M&A
宿舍
Merge branch 'master' of https://github.com/JessenPan/ZYNLPJPT

Conflicts:
	ZYNLPJPT.csproj
	ZYNLPJPT.suo
kj
add
Merge branch 'master' of https://github.com/JessenPan/ZYNLPJPT

Conflicts:
	ZYNLPJPT.csproj
modify csproj
finish function of pzctr
almost  finishs function of ckctr
finishs funtion of ckctr
finished functions of three
almost finished funtion of pzZyEjzb
finished function of pzzyEjzb

and added all functions template
modify KC
finish
Merge https://github.com/JessenPan/ZYNLPJPT

Conflicts:
	ZYNLPJPT.csproj
	ZYNLPJPT.csproj.orig
1
2
3