Merge pull request #11 from mbathletes/dylan

Dylan
Minor code refactor
Added roles to users
Merge branch 'master' of https://github.com/mbathletes/mbathletes into orlandov
Merge pull request #12 from mbathletes/orlandov

Orlandov
tab size merge conflict
Merge branch 'master' into andres
Reordered Migrations
Merge branch 'master' of https://github.com/mbathletes/mbathletes into orlandov
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