Done
Merge branch 'master' of https://github.com/jxieeducation/kirby

Conflicts:
	.DS_Store