The importance of functions.
Merge branch 'master' of https://github.com/ewcole/functional_programming

Conflicts:
	presentation.html
	presentation.org