Add emacs config
Merge branch 'master' into chewbacca