change folder www to public
Merge branch 'master'
copy from www to public