removed binding.pry so that I can automatically run tests
Merge branch 'ido'