working on dashboard
Merge branch 'master' of https://github.com/czengg/gearUp