add lots of stuff
Merge branch 'master' of https://github.com/gavindinubilo/Everybodj

Conflicts:
	sockio-server/package.json