Fixed public dir
Merge remote-tracking branch 'origin/master'
Fixer public dir