wat
Merge pull request #2 from twuster/part_2

wat
Merge branch 'master' of github.com:twuster/lab9 into erica
q3