yj
Merge branch 'master' of https://github.com/rememberlostcode/nuaa

Conflicts:
	html/js/base.js
	html/js/home.js