~
Merge branch 'master' of github.com:coreyoconnor/RCs

Conflicts:
	real-emacs.el