.
Merge branch 'juan'

merging branch juan
patched some errors, socket.io still not working