Added .emacs
yup
added kill
ok
Merge branch 'master' of https://github.com/gujo/dotfiles