text
Merge branch 'master' of https://github.com/jimmyn/qed

Conflicts:
	index.html