Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
first take on dashboard
Merge pull request #37 from comzeradd/dashboard

First take on dashboard