update diagram
add updated files for merge fixing
Merge branch 'cleaning-vs-mess'
Merge branch 'html-structure'
Merge pull request #2 from 00s/master

Master