my lisp learn
Merge remote-tracking branch 'origin/master'

Conflicts:
	emacs/org/collect.org