Working on dashboard
almost done with dashboard
Merge branch 'master' of https://github.com/RyanSchreiber/4Plan