Merge pull request #14 from mbathletes/andres

Andres
update
update
Merge pull request #15 from mbathletes/dylan

Dylan
Added user login authentication
Merge branch 'master' of https://github.com/mbathletes/mbathletes into andres