pull changes from hw3 branch to master branch