removed binding.pry from likes controller
commit for potential merge conflict with liz
fixed merge conflict in likes_controller
Merge pull request #9 from jpark1120/master

resolution of merge conflicts in likes controller