Merge branch 'master' of https://github.com/Warzou/serverNode

Conflicts:
	server.js