.
Merge branch 'master' of https://github.com/tomcatling/deflectometry

Conflicts:
	deflectometry.m