added grouping to exercises within workout closes #2