Merge pull request #16 from eanplatter/master

dashboard
Merge pull request #17 from joverall22/master

Merge pull request #16 from eanplatter/master