Merge branch 'assignment7'