from part2
Merge branch 'master' of github.com:volador/SocketLog

Conflicts:
	README.md