修改改主页
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/frontend/templates/index/index.html
Merge branch 'master' of https://github.com/kinorsi/Luyasi-Flask

Conflicts:
	app/frontend/templates/index/index.html