adding additional feeds for user locations in cookies
merging with master, resolving conflicts
receiving photos from multiple locations based on user cookies
Merge pull request #40 from pocket-gophers-2014/tracking_multi_locations

Tracking multi locations