test commit

jus' testin'
Merge branch 'master' into jed-dev
trachoma worksheet bug

https://basecamp.com/2184399/projects/2310289/todos/109361730
Merge remote-tracking branch 'origin/jed-dev'