2 werkende servers
2 werkende servers

Conflicts:
	server_god/app.js
	server_satan/app.js