Merging again..
Merge branch 'master' of https://github.com/jimadams25/FluidFitness
Merge branch 'master' of https://github.com/jimadams25/FluidFitness
Merge branch 'master' of https://github.com/jimadams25/FluidFitness
Merging and adding changes
Merge branch 'master' of https://github.com/jimadams25/FluidFitness
Merged and updated AddWorkout stuff