test performance
nginx interface confi
changed the builds
commit before update
Merge branch 'master' of http://github.com/lhr530124/nozomiServer into sortedScore

Conflicts:
	app.py
	app2.py