Merge pull request #32 from jiangxiaoli/dev_Jenn

start convert of gumball machine to state machine