Updated the markup!
Merge branch 'dom'

Conflicts:
	demo.html