Move along, nothing to see here.
Merge branch 'Optickle2-jm' of github.com:Optickle/Optickle into Optickle2-jm

Conflicts:
	debug/temp.mat