changes to some m files
Merge branch 'master' of github.com:kakila/NCReservoir

Conflicts:
	mFiles/s_track.m
reverting s_track