more edits

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

Conflicts:
	trap_model_manduscript copy.html
	trap_model_manduscript copy.md
fixed some of jaime's comments

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

Conflicts:
	trap_model_manduscript copy.html
	trap_model_manduscript copy.md
made edits based on some of jaimes comments

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

Conflicts:
	trap_model_manduscript copy.md