nuevo cambio
dddd
Merge branch 'master' into rama1

Conflicts:
	index.html
laralalalalala
Merge pull request #18 from cbernat/rama1

Rama1