Merge pull request #49 from mbathletes/dylan

fixed errors
updated routes bugs
Merge pull request #50 from mbathletes/orlandov

updated routes bugs
started to style admin page
Updated routes error and updated icons
started to style admin page
Update, conflicts fixed
Merge pull request #51 from mbathletes/andres

Andres
fixed conflicts