added
Merge branch 'master' of github.com:bombarie/we-make-carpets
Merge branch 'master' of github.com:bombarie/we-make-carpets
Merge branch 'master' of github.com:bombarie/we-make-carpets

Chased a bug where socket.io wasn't connecting. Turned out I was using socket.io 0.9.x and 1.x code through
each other. Now fixed but needs to be cleaned up