first commit
Merge branch 'master' of https://github.com/mattiaserlo/socketiotest

Conflicts:
	README.md