new
fix ignore
Merge branch 'master' of https://github.com/EcjtuNet/wmkj

Conflicts:
	.gitignore
	Submit.php
	Submit_gbz.php
	bglogin.php
	bin/menu.php
	class/PicArc.php
	class/WeChatCallBack.php
	class/model/classquery.php
	class/model/musicquery.php
	class/model/scorequery.php
	class/model/yktquery.php
	interface.php
	submit_gbz.html
	wx.html