markup commit 1
Merge branch 'gh-pages'

Conflicts:
	self6.html