modify socket.io listening port on client side
modify socket.io listening port on client side
modify socket.io listening port on client side
modify socket.io listening port on client side
remove test.txt
Merge branch 'master' into zoie
change socket.io connection to dev. on client side
add temp/ and tell git not to track
make it more like a chat room; bring in Margie's cards
add /temp and tell git not to track
Merge branch 'zoie'
change client side socket.io connection setting to production
solve automerge conflict