Rendering html page
Merge remote-tracking branch 'origin'

merge