Minor code refactor
tab size merge conflict
Merge branch 'master' into andres
Merge pull request #13 from mbathletes/orlandov

Orlandov
Committing sign in forms
Merge branch 'master' of https://github.com/mbathletes/mbathletes into andres
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
Merge pull request #16 from mbathletes/andres

Andres
added users controller
Merge branch 'master' of https://github.com/mbathletes/mbathletes into orlandov