Trying to get this working

hopefully this doesn’t break anything
Merge branch 'master' of https://github.com/everyusernamestaken/mullets

Conflicts:

StrokeTrials/StrokeTrials.xcodeproj/project.xcworkspace/xcuserdata/catjm
p.xcuserdatad/UserInterfaceState.xcuserstate
Revert e72d3ff..d1f17c6

This rolls back to commit e72d3ffdb71ecb2d598360ea283eb5fa19678424.
Not sure what is going on