strange commit,I'm ahead of origin
modify and Merge branch 'master' of github.com:qicongchen/frontend

Conflicts:
	server.py
Merge pull request #3 from starryDD/master

modify analysis