Merging assignment 4
Merge branch 'assignment 4'