Merge pull request #10 from KellyBlack/dev

Dev
adding more info to presentation
Merge pull request #26 from candaceliu/candace_dev

Candace dev