Exercise should include a description
Merge branch 'master' of https://github.com/glp115/IST412
MyWorkout and ExerciseChecklist changes
Merge branch 'master' of https://github.com/glp115/IST412

Conflicts:
	GymGuide/src/com/ist412/team2/gymguide/ExerciseChecklist.java