new edits

Conflicts:
	templates/base_wrap.html
edits