better plot
Merge branch 'master' of https://github.com/kakila/NCReservoir

Conflicts:
	mFiles/s_convertdata.m
	mFiles/s_track.m