Fix bug with duplicate workouts being created
Merge remote-tracking branch 'origin/kerwin-template' into kerwin-template