Cleaned up code and added transitions
Merge branch 'master' of https://github.com/jimadams25/FluidFitness