Changed title
sync conflict

Conflicts:
	template.html