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