change
Merge branch 'master' of github.com:scottmeng/pedometer-pc-client