may have accidentally added preferences. if possible, do selective merge when pulling this commit
okay i removed the prefs
Merge branch 'master' of https://github.com/ShadowSam/WorkoutCompanion