Given boundry

Working?...
Given boundry updae
Merge branch 'master' into Merge-Matt

Conflicts:
	trapModel.m
Midway through interpolating time

running the data through 'griddata' and getting 'qhull error'.
Corrected the wave height to a constant t