Where's the problem?
Merge branch 'master' of https://github.com/reederc42/OtherThanTCP

Conflicts:
	SendBuffer.hpp
	mock2.cpp