updated code
Merge branch 'master' of https://github.com/mbathletes/mbathletes into orlandov
Merge pull request #20 from mbathletes/dylan

Dylan
updated routes
merge master to my branch fixed conflicts
Merge pull request #21 from mbathletes/orlandov

Orlandov
updated routes
Merge branch 'master' of https://github.com/mbathletes/mbathletes into orlandov
Merge pull request #22 from mbathletes/orlandov

Orlandov
Merge branch 'master' into dylan