a
Merge branch 'master' of https://github.com/thecopy/ThorBangMQ

Conflicts:
	distributor_scripts/test-definitions/sendAndPopSameClient/logs/diff_num-db-threads/test4.1_server0_test.txt
Added figures
Merge branch 'master' of https://github.com/thecopy/ThorBangMQ