A lot of editing
Merge branch 'mazzuca'

Conflicts:
	html/womenbag1.html