I am in the middle of Updating the Y factor plotter.
Merge remote-tracking branch 'origin/master'

Conflicts:
	control.py
	function_test.py