read/write fun for easier error handling (not much improvement)
Merge remote-tracking branch 'origin/master'
Deadlock removed (case: timeout of request which was not first in server's request queue). Added debug info to makefile and few more couts for debug
merge makefiles