fixed encoding
Merge branch 'master' of github.com:gherlein/elisp

Conflicts:
	emacs
removed encoding of latin1