Merge branch 'master' of https://github.com/mmeshkatian/ariel Conflicts: src/BaseController.php src/views/index.blade.php
Merge branch 'master' of https://github.com/mmeshkatian/ariel Conflicts: src/BaseController.php src/views/index.blade.php