Updates for Assignment 2.2
Merge remote-tracking branch 'origin'