User id works or something
Merge branch 'master' of github.com:gordienoye/snakes

Conflicts:
	js/waiting.js