fixed emacs shortcut to quit
initial
Merge branch 'master' into gh-pages