change
Merge branch 'master' of https://github.com/jimadams25/FluidFitness

Conflicts:

FluidFitness/src/com/android/fluidfitness/adapters/CustomWorkoutAdapter.
java