getting closer with the favorites, they are being pulled out, but not saved
resolved conflicts
Merge pull request #18 from phoebebscott/marysbranch

getting closer with the favorites, they are being pulled out, but not sa...