started creating places to show up on the feed
Added friend's trips to the feed
Fixed merge conflict