Scala note
Merge branch 'master' of https://github.com/roblevi/roblevi.github.io
Forgot to pull before modification