Got angular and socket.io playing nicely.

Signed-off-by: George Old <george.old@anmedia.co.uk>
Merge branch 'master' of github.com:panos2point0/versus

Signed-off-by: George Old <george.old@anmedia.co.uk>

Conflicts:
	views/index.jade