Merge pull request #1 from codefellows/master

Catching up w/ Brad's Day 3