M&A
Merge https://github.com/JessenPan/ZYNLPJPT

Conflicts:
	ZYNLPJPT.csproj
modify a bug that produced in conflict merge process
add score calculating algorithm and related pages&classes
Merge https://github.com/JessenPan/ZYNLPJPT
Merge https://github.com/JessenPan/ZYNLPJPT

Conflicts:
	ZYNLPJPT.csproj
M&A
Merge branch 'master' of https://github.com/Aotechou/ZYNLPJPT into Aotechou-master

Conflicts:
	ResultPage.aspx.cs
	ZYNLPJPT.csproj
Merge branch 'AoteChou-master'