commit before pull
merge
dashboard
Merge pull request #23 from tomsword/dashboard

Dashboard