Update
Merge https://github.com/rnecesito/vetro

Conflicts:
	client/css/main.css
	client/main.html
Update HTML and CSS