Fixed a few things in the matlab main
Please enter the commit message for your changes. Lines starting
Trying to merge
Merge branch 'master' of https://github.com/harperj/fabsense

Conflicts:
	MATLAB/scripts/main.m
	vis/index.html
	vis/vis.js