Merge pull request #5 from aammd/master

Get changes from upstream into Jenny's fork
Jenny starts on FunctionalProgramming
Merge pull request #38 from jennybc/master

Jenny starts on FunctionalProgramming