video tag
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/home/welcome.html.haml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/assets/application-efe99b9bd53152b9f09acfe1dea9b554.js.gz
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/assets/manifest-88f361c846f46a83782e508cf882ed8c.json
Nuevos iconos