Just merging..
Merge branch 'master' of https://github.com/jimadams25/FluidFitness
Merging with Master
Merge branch 'master' of https://github.com/jimadams25/FluidFitness
Changed navigation for creating a workout
Merging with master
Merge branch 'master' of https://github.com/jimadams25/FluidFitness