part way through new feature
Merge branch 'new-feature'

Conflicts:
	index.html
new feature added