adding the undo tree to emacs
Merge branch 'master' of https://github.com/Yazany6b/Emacs

Conflicts:
	.emacs