p
Merge remote-tracking branch 'origin/master'

Conflicts:
	allresults.html
	images/pattern1.png