new history and result page. update some codes, string
Merge branch 'master' of https://github.com/chjt/CharityWorkout