added setfun
pull
Merge branch 'master' of https://github.com/tamsayers/scala-course