Merge conflict
Merge conflict
Chirag's code in WorkoutTracker.cs

Added WorkoutTracker.cs which has methods to check shoulder exercises to
avoid merge conflicts.