var dir
update
Merge branch 'master' of https://github.com/ideil/laravel