manually solved routes conflict
add pry for debugging
Merge pull request #12 from elitenomad/federico

Federico