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

Conflicts:
	distributor_scripts/test-definitions/sendAndPopSameClient/conf.txt
	distributor_scripts/test-definitions/standardTest/test.txt
Added some stuff to report
Merge branch 'master' of https://github.com/thecopy/ThorBangMQ

Conflicts:
	report/report.tex