more crap
Merge branch 'master' of github.com:toriqo/laravel