modified the sourcecode
Merge branch 'master' of https://github.com/fs814/Settings

Conflicts:
	.emacs.d/org/work.org