organization
Merge branch 'master' of https://github.com/rosehartman/frog-trap
Went over Noam's edits, changed a few last things. Looking good!