first commit for heroku
Removing compiled js from gitignore
Heroku... Merge remote-tracking branch 'origin/node-backend' into node-backend

Conflicts:
	.gitignore
	package.json
	server/sockets.js
	static/js/room.coffee