updated sign-in, profile, and controllers
Merge branch 'master' of https://github.com/mbathletes/mbathletes into dylan
Merge pull request #20 from mbathletes/dylan

Dylan
updated routes
merge master to my branch fixed conflicts