Merge pull request #33 from jiangxiaoli/dev_Jenn

gumball machine converted to state machine