not sure what this did
nothing changed
Not sure what I’m committing
...
.
...
Merge branch 'master' into Jesse

Conflicts:

Chrons.xcodeproj/project.xcworkspace/xcuserdata/jesse.xcuserdatad/UserIn
terfaceState.xcuserstate
	DerivedData/Chrons/Logs/SCM/Cache.db
	DerivedData/Chrons/TextIndex/text-index.idx