ip + client update
Merge branch 'master' of https://github.com/BastiaanAndriessen/EXP_WORKSHOP

Conflicts:
	server_satan/app.js
	server_satan/public/js/client.js