Made a few changes to files below
Merge branch 'master' of https://github.com/pabloj100000/Matlab

Conflicts:
	NewClass/SaccadeObject.m