clase 5
Merge branch 'master' of https://github.com/datyayu/Pulse2014-America

Conflicts:
	estilos.css
	index.html