中稳居然各种打不出来，windows命令行若爆了
Merge branch 'master' of https://github.com/LiuJi-Jim/bad-apple

Conflicts:
	detail.html