messed around with xml
merged
Merge branch 'master' of github.com:jimadams25/FluidFitness
Merge branch 'master' of github.com:jimadams25/FluidFitness
hi
minor changes
Merge branch 'master' of github.com:jimadams25/FluidFitness
changed color to int