修改信息
Merge branch 'master' of https://github.com/HCI-webdesigner/Lixueyuan

Conflicts:
	views/introduction.html