Merge branch 'master' of E:\Work\Laravel\Sahel-Site\movies with conflicts.
Merge remote-tracking branch 'origin/master'
by sujan