完成了简单的点菜和结算
Merge branch 'master' of https://github.com/daodaoliang/caicai

Conflicts:
	src/main.cpp