added emacs stuff
Merge pull request #1 from donyu/master

Emacs Edits