html log in pogress
Merge remote-tracking branch 'origin/master'

Conflicts:
html log in pogress