rm web

rm web
Merge branch 'dev'