Merge pull request #5 from aammd/master

Get changes from upstream into Jenny's fork
integration exercises
Jenny starts on FunctionalProgramming
Merge pull request #37 from adletaw/master

added table of contents
Merge pull request #38 from jennybc/master

Jenny starts on FunctionalProgramming
Davor's functional programming exercises
Merge pull request #39 from cubranic/davor-funprog

Davor's functional programming exercises