Final version, add lots of comments
Merge branch 'master' of https://github.com/Cynthia1991/assignment2-v2
final version
delete temp