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

Conflicts:
	report/report.tex