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

Conflicts:
	API/Connection.cpp
	API/Connection.h