...
Merge branch 'master' of https://github.com/arnabold/mashing
...
Merge branch 'master' of https://github.com/arnabold/mashing

Conflicts:
	elisp/3.how-to-write-function-definitions.el
...