Se avanza en el catalogo de premios
Merge branch 'master' of https://github.com/davidcaro/demoteros-app

Conflicts:
	css/style.css