Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/master' of github.com:Trott/mwf into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/develop' into ucsf/master
Fitness refactor and minimal tests
Merge branch 'ucsf/develop' into ucsf/master