Working copy
Merge branch 'master' of https://github.com/zangoochi/wp1

Updating hw2