Fixed the favorites saving that someone broke
Fixing merge conflicts
Fixed save favorites and merge conflicts
Merge pull request #211 from iameric1986/master

Fixed the favorites saving that someone broke