未计算饭钱的时候
chouma to chip
chip to chouma
hello, world
add notes.txt
asdfa
Merge branch 'master' of github.com:nettedfish/dzpk

Conflicts:
	info.cfg