blog
更新
Merge branch 'master' of github.com:Majors/majors.github.io

Conflicts:
	index.html