adding some socket stuff
Merge branch 'master' of https://github.com/mhacks-nalostalati/obstaclr

Conflicts:
	public/page.js
Merge branch 'master' of https://github.com/mhacks-nalostalati/obstaclr
names work now