merged conflicts
removed binding pry...idiot
another damn binding.pry
merged conflicts
Merge branch 'master' of github.com:deereb/competitive_instagram