Cambio de Mario
Avance de las diapositivas sobre la charla de frontend
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Merge pull request #3 from Kr0mAgn0n/master

Cambio de Mario