add keywords
Merge branch 'master' of github.com:FrankFang/hexo

Conflicts:
	source/_posts/2014-01-12-the-new-generation-of-blog.md