增加了emacs
Merge pull request #24 from guoxiangyang/master

怎么能没有神的编辑器呢？
merge origin master
Merge branch 'master' of git://github.com/JacksonTian/fks