Merging and changed adapters
Merge branch 'master' of https://github.com/jimadams25/FluidFitness
Merged and changed adapters