animacion welcomne
Merge branch 'master' of github.com:ixchelzg/memorias_embarazo

Conflicts:
	app/webroot/css/tema1.css
fix de la animacion