changes
Have master
No changes
Fixed my Error
no changes
Have man branch
Merge branch 'master' into Merge-Matt

Conflicts:
	toConstantTime.m
	topViewOfWater.m
	trapModel.m
Merge branch 'Merge-Matt'
Merge branch 'master' into John's-branch