fixing merge
Merge branch 'master' of https://github.com/rebeccamurphy/ProgrammingOfThePast
handing functional programs in 1st time