removed binding.pry
Merge branch 'ido'