mapreduce finals
Merge branch 'master' of https://github.com/jplay83/SAD2

Conflicts:
	jonas/report.tex