week 2 part 2
Merge branch 'master' of https://github.com/kojotak/progfun