Update
Merge branch 'master' of https://github.com/XinyiDeng/DWD-Server

Conflicts:
	server.js
Update