冲突了哦
Merge branch 'master' of https://github.com/elvis9xu/xjd-note

Conflicts:
	src/main/webapp/META-INF/MANIFEST.MF
	src/main/webapp/assets/css/main.css
	src/main/webapp/assets/img/logo-114.png
	src/main/webapp/assets/img/logo-32.png
	src/main/webapp/assets/img/logo-57.png
	src/main/webapp/assets/img/logo-72.png