Merged origin/master with local.
Merge branch 'master' of github.com:redchief001/eltodo.el

Conflicts:
	scratchpad.el