链接采用“不淡定”风格
Merge branch 'master' of https://github.com/ipoly/ipoly.github.com

Conflicts:
	assets/themes/compass/javascripts/main.coffee
	assets/themes/compass/javascripts/main.js