addyhgn
Merge pull request #15 from zhaohaojie-git/master

hahhah succeed finally!!!!
fix fix fix~~
Merge https://github.com/JessenPan/ZYNLPJPT

Conflicts:
	ZYNLPJPT.suo
	ZYNLPJPT.suo.orig
Merge pull request #16 from AoteChou/master

heyheyhey~
modify the default.htm
add function of xgmm.aspx
fix the bug
m&a
Merge https://github.com/JessenPan/ZYNLPJPT
Merge pull request #17 from AoteChou/master

f&m&a
ddd
Merge pull request #18 from AoteChou/master

ddd
upload
Merge branch 'dinghaoDH-master'

Conflicts:
	ZYNLPJPT.suo
fix the bug
fix the bug in pzZsdyToEjzb.aspx
fix the bug
haojie
Merge branch 'master' of https://github.com/JessenPan/ZYNLPJPT