Test de inicio
Merge branch 'master' of https://github.com/nelsondaza/NodeChat

Conflicts:
	css/main.css
	index.html
	js/main.js
	server/app.js