Merge pull request #1 from KellyBlack/dev

Bringing repository up to date
Candace's first change
Merge pull request #3 from candaceliu/candace_dev

Candace dev