plots
Merge remote-tracking branch 'origin/master'

Conflicts:
	plot2.png
	plot4.png