Finished everything but bonus
Merge pull request #5 from csmoseley/chris

Finished everything but bonus