removed binding.pry
Merge branch 'master' into kyle