Changed chad and brandon
Fixed that hack
Merge pull request #15 from githubteacher/chads-branch

Chads branch