init
Merge branch 'master' of https://github.com/juanvc123/chat-social

Conflicts:
	README.md
Merge branch 'master' of github.com:juanvc123/Chat-socket.io-node.js

Conflicts:
	README.md
	app.js
	handleEvents.js
	static/css/style.css
	static/css/style.styl
	static/index.html
	static/script.js