Logic finished for dashboard.
Feature testing for user, badges, and dashboard
Merge branch 'back-end' into development
Tests being added to Master
Merge branch 'front-end' into dashboard