First commit of Assignment 4
Merge remote-tracking branch 'origin'