socket.io for express 3
Merge branch 'master' of heroku.com:nko4-dev

Conflicts:
	config/app.js
Merge remote-tracking branch 'origin/master' into redesign
revamp views to use new jade extends block