what?
what? 2
Merge branch 'master' of https://github.com/Technochrome/Tsunami-REU-2013-code-

Conflicts:
	trapModel.m