notifications
Merge branch 'master' of https://github.com/jonathanysp/teamQuality

Conflicts:
	nodejs/public/css/style.css
	nodejs/public/js/socket.js