update
Merge branch 'master' of https://github.com/tleeuwen/Penalty-Method

Conflicts:
	doc/report.aux
	doc/report.log
	doc/report.pdf
pdate