update for testing
Merge branch 'master' of https://github.com/jonathanysp/teamQuality

Conflicts:
	nodejs/public/leaderboard.html
Merge branch 'master' of https://github.com/jonathanysp/teamQuality

Conflicts:
	.DS_Store
	nodejs/public/css/style.css
	nodejs/public/js/socket.js
	nodejs/public/leaderboard.html
	nodejs/require/game.js