favorites
merge conflicts
controller test all passing for favorites
feature test all passing
merged master in local branch
fixed tests
Merge pull request #100 from eugenefilimonov/working_branch

Working branch