测试发布一篇文章
Merge branch 'gh-pages' of https://github.com/supgeek-rod/DevMarks into gh-pages

Conflicts:
	_posts/devs/201407/2014-07-19-浏览器缓存机制.md