added pry to gemfile
Added Map model, maps controller
Changed name of map model and controller to pin
copied AJAX Map lab for pins_controller
Picture model added.
Corrected Picture model.
Added Paperclip changes.
Includes deleted file.
Copied maps example from Colt's google maps app, not displaying
Fixed pins. Pins display on map and save to database.
added latest master
making git happy
Resolving .gitignore merge conflict.
resolved merge errors
Add search_radius to User and event_id to Picture.
Merge pull request #4 from jperrone1/photos

Photos branch
models set up
models up and running
resolve gemfile merge
fixed merge errors