error checking appended.
modify and Merge branch 'master' of github.com:qicongchen/frontend

Conflicts:
	server.py