completed exercises 1 & 2
Merge branch 'master' of https://github.com/dmacdonald2013/functional-scala