Additions to assignment 4
Merge remote-tracking branch 'origin'