add
Merge branch 'master' of https://github.com/super-zou/master-inherit

Conflicts:
	css/userInfoEditor.css
	js/mainPage.js
	mainPage.html