complete favorite questions and view
complete merge conflict
completed a couple of tests
comnpleted merge conflict and test
Merge pull request #38 from eugenefilimonov/favorite_question

Favorite question