refactoring sasha's code into measurement
Merge branch 'master' of https://github.com/mprinc/Bujad

Conflicts:
	main.nls