Spline now functional
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/controller.h
	Source/log750_lab1.pro