Stuff
Stuff
Merge branch 'master' of https://github.com/krasm/emacsrcMO

Conflicts:
	emacs-rc-org.el
	init.el