Took a look at Noam's changes and made a few tweaks. this paper is gonna be awesome!
finished tweaks to noams edits

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

Conflicts:
	trap_model_manduscript copy.html
	trap_model_manduscript copy.md