Binding.pry not working
Merge remote-tracking branch 'upstream/master' into add_faceted_search
Added faceted search for brand and carrier
Corrected irreversible migrations, added condition model
Implemented condition facet
Added fabrication and faker gem for quicker seeding
Added link to navigation and user information to ad/show page
resolved conflicts
resolved conflicts
Solved conflicts with ad filters and photo uploads
Resolved conflicts with the filters and photo uploads
Merge pull request #18 from eduardopoleo/master

Fixed conflicts