Merging with Master
Merge branch 'master' of https://github.com/jimadams25/FluidFitness
Trying to merge to get library files
Merging and made changes