Merge remote-tracking branch 'origin/master'

Conflicts:
	demos/index.html

initial commit of the entire file that I am working on