UPDATE CS 402 02
CORRECTED SCALA STYLE
Merge branch 'CS452-01' into CS402-02
Merge remote-tracking branch 'origin/CS402-02'