Chinese
Merge remote-tracking branch 'upstream/master'

Conflicts:
	views/home.jade
c9 related changes
Merge pull request #5 from settinghead/master

C9 Related Changes