Done required tasks 5-10 for Assignment 4
Merge remote-tracking branch 'origin/master'