working on workout model
Fixed merge conflicts
Merge pull request #4 from sabsowitz/sunday_workout_model

working on workout model