random changes to gemfile. needs to be fixed
updated local branch. Merge branch 'master' of https://github.com/Renter/rentr
adds google maps api and maps controller
location search returns city show page if exact match, returns search results otherwise
resolved merge conflicts
admins can add locations with coordinates for locations
improved format, and routes, removed useless files
fixed formatting, appeased the hound.
removed empty lines for the hound
removed extra layout file
replaced some code with semantically clearer methods
appeased the hound
Merge pull request #6 from Renter/jb-maps

Jb maps