committing Al's second change
Merge branch 'master' of https://github.com/edwardwu143/lab2-2
final version