merge georgebonnr changes 10/29 into RyanMG frontend Merge branch 'refactor' of https://github.com/kinetech/Performance into refactor
merge georgebonnr changes 10/29 into RyanMG frontend
Merge branch 'refactor' of https://github.com/kinetech/Performance into refactor

Synesthesia-2/Synesthesia,kinetech/Synesthesia