first commit of serving drink
Merge branch 'master' of https://github.com/odestcj/hackathon_aug2013