assignment5 re-push
Merge pull request #36 from WenyingLiu/master

Assignment5 re-push - from Wenying Liu