m and a
add bin commit
dsa
Merge branch 'master' of https://github.com/JessenPan/ZYNLPJPT

Conflicts:
	ZYNLPJPT.suo
zxsa
Merge pull request #23 from zhaohaojie-git/master

还有些地方新发现了要改的 等下浩杰改完了再push