hmm
Merge branch 'master' of https://github.com/ciekawylogin/tinylib

Conflicts:
	sockets/Socket.cpp