edit css
Merge branch 'master' of https://github.com/ovidio43/heaven

Conflicts:
	wp-content/themes/ThemeColchonesheaven/archive-video.php