Create index.html
Copied and pasted code from html/index.html
Changed index.html
made changes
Removed extraneous html/index.html
Merge branch 'next'

Conflicts:
	html/index.html