jjj
Merge branch 'master' of https://github.com/labshasan/PHP-Laravel

Conflicts: