detele html
Merge branch 'part1'