Change anchors to numbers instead.
Merge branch 'master' into pr-4

Conflicts:
	template.html