first commit
Merging the branch 'master' of https://github.com/rajdon/emacs