dashboard
fixed conflicts
Merge pull request #2 from marineb/sheldon

dashboard