added workouts model
fix merge conflict