functional infinite scroll
adding additional feeds for user locations in cookies
Merge pull request #37 from pocket-gophers-2014/rex_and_nick_infinite_scroll

functional infinite scroll
merging with master, resolving conflicts
scrolling with an offset margin implemented, and the feed width maxes out at 3 images wide with 50 px total margin between consecutive images
receiving photos from multiple locations based on user cookies
Merge pull request #40 from pocket-gophers-2014/tracking_multi_locations

Tracking multi locations
Merge pull request #39 from pocket-gophers-2014/testing_camera_controller

Testing camera controller
merging with master
Merge pull request #38 from pocket-gophers-2014/scroll_event_trigger_area

scrolling with an offset margin implemented, and the feed width maxes ou...
Merge pull request #41 from pocket-gophers-2014/additional_styling

Additional styling
Merge pull request #42 from pocket-gophers-2014/additional_styling

Added additional styling for bottom buttons.
Merge pull request #43 from pocket-gophers-2014/additional_styling

Added usable button submission styling.
Fixed merge conflicts