commenting
Merge branch 'master' of github.com:erezschatz/emacs

Conflicts:
	emacs.el
Merge branch 'master' of github.com:erezschatz/emacs

Conflicts:
	emacs.el