11-22
use 996
4
update
4
nozomi
before merge kaixin
Merge branch 'kaixin' of https://github.com/lhr530124/nozomiServer into mainServer

Conflicts:
	app.py
	startApp.sh