sockets WORK! almost!
Merge branch 'master' of github.com:antigoliath/PennApps2013S

Conflicts:
	public/scripts/sockets.js