Adding emacs temp files to .gitignore.
Merge branch 'master' into logging