3.1, 3.2, and 3.3
Merge branch 'oop_in_scala' into scalainaction