add node
works with node rooms
node stuff did
Merge branch 'master' of https://github.com/jennypeng/hacktech

Conflicts:
	spotify/scripts/main.js
	web/web.html