index.html
Merge branch 'bugfix'

Conflicts:
	index.html
new title
Merge branch 'bugfix'