Updated part 1 of assignment 2
Updated part 2 of assignment 2
Merge remote-tracking branch 'origin'