Given boundry

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

Conflicts:
	trapModel.m