socket session id
gfile
Merge branch 'master' of github.com:norbertes/foosball

Conflicts:
	backend/server.js
	frontend2/Gruntfile.js
	frontend2/app/views/main.html