More changes
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace.git
More changes