Fixed feed.link bug
Merge pull request #1 from yisibl/master

增加 type.css
Merge pull request #2 from yisibl/master

调整pre 和 code 样式，删除planet.css 中重复样式
Merge branch 'master' of github.com:dotnil/cupid-alibaba
Try pygments default theme; removed useless css
Ignore npm output
Combine neat and type

Merge remote-tracking branch 'yisibl/master'

Conflicts:
	index.jade