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
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
resolved merge errors
resolve gemfile merge
fixed merge errors
corrected gemfile merge poops
Merge pull request #3 from antmachine/master

Tim's suggestion