Some more stuff
Merge branch 'master' of https://github.com/raygit/Introduction_to_Scala