Merge branch 'master' of github.com:ricarora/SeeMore-Indigo into unsubscribe-ajax
work on rspec simulating a log in
my git is not so good, i made some other changes and didn't add them properly
work on rspec with bookis
unsubscribe msgs method
Merge branch 'instagram-private' into unsub-msgs
added subscribe method
unsubscribe & subscribe done for vimeo search
add unsubscribe button on twitter & instagram search result page
merge conflict
rearranged twitter search results page, added avatar class to apply to all instances of avatar images
add rspec test that checks that feed is loaded for index page when user is logged in
edit ajax for subscribe & unsubscribe for search result page
rearranged vimeo results page, added link_to twitter/vimeo profiles on avatar images
Merge pull request #44 from ricarora/unsubscribe-ajax

Unsubscribe ajax
Merge branch 'master' into unsub-msgs
rearranged instagram search page, added link_to profile to avatar and avatar class
random message method applied to search pages
Merge pull request #45 from ricarora/unsub-msgs

Unsub msgs
resolved merge conflicts