removing binding.pry
merging master