new post
Merge branch 'gh-pages' of https://github.com/bjfuzzj/workdiary.git into gh-pages

Conflicts:
	_posts/2014-09-01-2014骞?9鏈?1鏃?.md
new posts