Merge branch 'hw5'
Merge branch 'master' into hw5