fixing template
Merge branch 'fix'

Conflicts:
	_layout/template.html