Changing cursor color
Merge branch 'master' of https://github.com/steveshogren/Dot-Emacs
Adding shortcuts
Merge branch 'master' of https://github.com/steveshogren/Dot-Emacs

Conflicts:
	shortcuts.el