changed activity follow_id back to shop.
merge conflicts
was still trying to find the coffee image.
added shop_id and is_review to activities
deleting empty lines
checkins needed a drink_rating to get past validations
add shop_id to drink and favorites activities
add shop id to reviews and is checkin to reviews that are checkins.
updated news feed messages for checkins
changed review_type value to string. Wasn't being caught in the controller if statement.
added drinksPartial class back, needed for AJAX.
passing shop id to controller action.
creating activities variable for shop news feed.
rendering shop activity
adding ajax to shop activity
limiting recent activity to 10
Merge pull request #14 from Pwalker86/phil/shop_activities

Phil/shop activities