Merge branch 'html'
fixed index.html
Add text to index.html
whatever this is, do something please