好像不需要写 text
Merge branch 'master' of https://github.com/fex-team/fex-team.github.io

* 'master' of https://github.com/fex-team/fex-team.github.io:
  update link url
  update
  update
  edit content
  update cover image
  add article and images
  fix
  fix
  add some
  add some
  Update 2014-04-10-traffic-hijack-2.md
  add some
Merge branch 'master' of https://github.com/fex-team/fex-team.github.io

* 'master' of https://github.com/fex-team/fex-team.github.io:
  添加用户照片
  用户照片需要用小写字母
  update code
  update code
  update tag
  update code
  update codes
  update code
将首页图片的 jpg 转成 png，减小 500k
修复图片的问题
加入协同编辑的文章
简单的文字修改