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
add /temp and tell git not to track
Merge branch 'zoie'
change client side socket.io connection setting to production
solve automerge conflict
Merge branch 'zoie'

Conflicts:
	templates/editor.hbs
Escape handlebars so that it functions on the server
Merge branch 'master' of github.com:deanwenick/nfz

merge Zoie's and Margie's updates