see notes
revision
oops
Merge pull request #14 from portlandcodeschool/amandaHoule

see notes on lines 55, 103-04