update server/client/server connection
Merge branch 'master' of https://github.com/BastiaanAndriessen/EXP_WORKSHOP

Conflicts:
	server_satan/app.js