Homework number 2
Merge branch 'master' of github.com:jeffandcarrie/fp_scala