Merge pull request #14 from candaceliu/candace_dev

Candace dev
Merge pull request #7 from KellyBlack/dev

Dev
Merge remote-tracking branch 'origin/dev' into candace_dev