Merge branch 'master' of https://github.com/freddier/Frontend2-Europa

Conflicts:
	css/puls4.css
	css/puls4.styl
Volviendo al estado original