finished edits based on Jaime's comments
finished edits

Merge branch 'master' of https://github.com/rosehartman/frog-trap

Conflicts:
	trap_model_manduscript copy.md