Rename simple.html to index.html.
Merge branch 'master' into init-chat

Conflicts:
	app.py