Merge branch 'loggingIn'
Merge branch 'master' of https://github.com/edahlseng/um-sportssync