working on 2
Merge branch 'master' of https://github.com/katchen/cs276pa3
task 2