:)
fixed base.html conflict

Conflicts:
	templates/base.html