Cargando mapa mediante sockets

No funcionara la app!
Merge branch 'master' of https://github.com/realbluehead/yatl

Conflicts:
	bin/www
	node_modules/socket.io/latest
	node_modules/socket.io/node_modules/engine.io/node_modules/.bin/wscat

	node_modules/socket.io/node_modules/engine.io/node_modules/engine.io-parser/node_modules/utf8/tests/generate-test-data.py
	node_modules/socket.io/node_modules/engine.io/node_modules/ws/bin/wscat

	node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Release/bufferutil.node

	node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Release/obj.target/bufferutil.node

	node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Release/obj.target/validation.node

	node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Release/validation.node

	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/lib/transports/index.js

	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/lib/transports/polling-xhr.js

	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/.bin/wscat

	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/engine.io-parser/node_modules/utf8/tests/generate-test-data.py

	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/bin/wscat

	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/Release/bufferutil.node

	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/Release/obj.target/bufferutil.node

	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/Release/obj.target/validation.node

	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/Release/validation.node
	public/javascripts/yatl.js
	server/game.js