Fixed index.html
Added the comment to index.html
Merge branch 'hotfix'

Conflicts:
	index.html
asdfsa
Added table tag
Merge branch 'hotfix2'

Conflicts:
	index.html