Revert to e996
Merge branch 'master' of https://github.com/chjt/CharityWorkout