from QS

from QS
Merge branch 'master' of https://github.com/davesmith/davesmith.github.io

Conflicts:
	HTML/demo.html