Merge branch 'master' into Matt's-branch
Commit after removing the .savedTrapModel from the tree
Merge branch 'John's-branch' into Matt's-branch

Conflicts:
	General Prabolic case/Save video.txt
	General Prabolic case/eta_0.m
	General Prabolic case/parasolution.m
	captureFrame.m
	endMovieCapture.m
	eta_0.m
	startMovieCapture.m
	toConstantTime.m
	topViewOfWater.m
	trapModel.m