pulling schema
parameterizing the js yelp call and fixing broken div in index.html.erb
able to save data returned from yelp into location model and view objects
moving app javascript logic to main.js and testing google geocoder
testing geocoder and adding a partial for results map
adding Google API KEY to gitignored config/initializers/google.rb and adding google maps script tag to application.html.erb
moving yelp logic to main.js and adding basic maps
modulerizing map center coords
adding geocoding into location model
working on adding markers
cleaning temp file
resolving merge conflict
fixing more merge comflicts
Merge branch 'development'
Merge pull request #11 from jtrope89/master

Fixed Merging Issues