cambio 1
cambio 2
Merge remote-tracking branch 'alfonso/features/f1' into features/carlos

Conflicts:
	css/style.css
	index.html
Merge pull request #5 from cjuega/features/carlos

Features/carlos