fixed link
fixed link
Merge branch 'master' into gh-pages

Conflicts:
	template.html