1.0v rama2
Merge branch 'rama2'

Conflicts:
	cosa.html