Merge pull request #40 from jwisch91/master

View Workout Goes to Progress
Fixed Bugs
more bug fixes
Fixed Clear Workout
Merged with Ryan