septet + thresh - 0.15
Merge branch 'master' of github.com:naturegirl/cos424project