resolving last conflict on users show
removing geocoder, adding support for auction locations with google geocoding api
auction class methods for location working
resolving conflicts in users show and auctions controller
adding back in root route
Merge branch 'development' of github.com:trinityXmontoya/project_2 into testing
working on geolocation search
Merge branch 'development' of github.com:trinityXmontoya/project_2 into development
Merge pull request #24 from trinityXmontoya/testing

Merge testing into development with some geolocation functionality for auctions
completed auction views
merge auction_views development, conflicts resolved
Merge branch 'bids' into development
fix bid mark_as_viewed method
fix bid create method
remove add_comment method, comment should be added when bid is created