:donot chang mycode
Merge branch 'master' of https://github.com/stanleylfc/MCC

Conflicts:
	view/index.html