Merge pull request #36 from jiangxiaoli/dev_Jenn

Reorg files, add ability to retrieve shot-out gumball (incomplete)