Merge pull request #26 from mbathletes/dylan

Dylan
Added admin dashboard
Fixed route conflicts
Merge pull request #27 from mbathletes/andres

Andres