文件也删除吧
Merge branch 'master' of https://github.com/scau-sidc/scau-sidc.github.io

Conflicts:
	_posts/2014-10-25-a-piece-of-simple-javascript-for-template-render.md