add 20140311 post
Merge branch 'master' into blog

Conflicts:
	_data/books.yml
修正书单
Merge branch 'blog'