fixed merge conflict on dashboard show page
trying again
Merge pull request #3 from edatrix/starting_dashboard_view

fixed merge conflict on dashboard show page