wang
Merge branch 'master' of https://github.com/qdayy/mjc

Conflicts:
	Juhe/Home/View/Data/index.html