edits
Merge branch 'master' of github.com:Joostvanderlaan/docker-laravel