oo
Merge branch 'master' of https://github.com/abulo/laravel_web