Finished favorite
Merge remote-tracking branch 'upstream/master'
Merge pull request #22 from xiatao123/master

finished fav