aaa
hahah~~
Merge branch 'master' of https://github.com/zhaohaojie-git/ZYNLPJPT

Conflicts:
	ZYNLPJPT.csproj
	ZYNLPJPT.csproj.orig
	ZYNLPJPT.suo
Merge branch 'master' of https://github.com/JessenPan/ZYNLPJPT
add new function
Merge pull request #8 from dinghaoDH/master

add new function
fix the bug in javascript file
...
Merge branch 'master' of https://github.com/JessenPan/ZYNLPJPT

Conflicts:
	ZYNLPJPT.csproj
	ZYNLPJPT.suo
QQQ
Merge pull request #9 from zhaohaojie-git/master

QQQ
sss
Merge pull request #10 from zhaohaojie-git/master

sss
aa
hhh
fix the bug of login
fix the bug in login
delete the file
delete the file
ssss