mergesort stuff
merge and fix .csv references

Merge branch 'master' of github.com:jmoles/laser-patroll

Conflicts:
	doc/report.tex