Minor changes in Assignment 2.1 and 3
Merge remote-tracking branch 'origin'