git Merge branch 'master' of https://github.com/jccf091/myflix
git pull Merge branch 'master' of https://github.com/jccf091/myflix
Merge branch 'master' of heroku.com:jccf-myflix