initial without a symlink
Merge branch 'master' of github.com:alainbateman/emacs

Conflicts:
	.my_emacs