Merge pull request #3 from jiangxiaoli/dev_Jenn

reorganized src files. added some code for gumballMachine class.