Push user to firebase
Fix merge conflicts
Fix typo
Fix merge conflict
Fix merge conflict
Mostly fixed -- need to fix re sign in
Merge branch 'master' of github.com:sihrc/Story-Quilt