Merge pull request #6 from benticsay/master

fixed merge conflicts in movies index and movies controller
merged files together and mades notes with Ben
Merge pull request #7 from jpark1120/master

merged files together and mades notes with Ben
html changes
Merge branch 'master' of github.com:LizCira/screen_test
html changes deleting comments
Merge branch 'master' of github.com:LizCira/screen_test
avoiding merge conflict
made adjustments to movie render function to make drag work
Merge pull request #8 from jpark1120/master

made adjustments to movie render function to make drag work
Merge branch 'master' of github.com:LizCira/screen_test
Merge branch 'master' of github.com:LizCira/screen_test
comitting to branch
dragging posts a movie posts as a like via ajax call, but the relevant movie id is not selected
removed binding.pry from likes controller
commit for potential merge conflict with liz
comitting 'like' post changes to date
Merge branch 'master' of github.com:LizCira/screen_test
fixed merge conflict in likes_controller
Merge pull request #9 from jpark1120/master

resolution of merge conflicts in likes controller