Merge pull request #1 from screamingmunch/master

carrierwave photo upload done (also created photos controller)
FB omniauth update
Merge pull request #2 from tmehta2442/master

FB omniauth update
Added pothole controller and rspec gem
Merge pull request #3 from rocketfish/pothole_controller

Added pothole controller and rspec gem
Rspec files for models
Added instructions on running rspec into pothole_spec.rb comments
Fixed routes for potholes index
Merge pull request #4 from rocketfish/rspec_setup

Rspec setup
Added initial mapping functionality
Fixed outdated gemfile.lock issue
Merge pull request #6 from rocketfish/rspec_setup

Fixed outdated gemfile.lock issue
Merge pull request #5 from Bkahler/master

Added initial mapping functionality
Changed javascript to coffeescript
Merge pull request #7 from rocketfish/newfeature

Changed javascript to coffeescript
whatever
blah
gul dukat
github is dumb
whatever2.js => potholes.js