what happened to html???
Merge branch 'master' of https://github.com/demosophy/Demosophy

Conflicts:
	index.html