Merge pull request #5 from twuster/erica

Erica
wat
Merge pull request #6 from twuster/part_6

wat
wat