ganadoras
 Merge branch 'master' of https://github.com/BowlMinions/Frogger
titulos pages
Merge branch 'master' of https://github.com/BowlMinions/Frogger
Merge branch 'master' of https://github.com/BowlMinions/Frogger
update local asdsa
Merge branch 'master' of https://github.com/BowlMinions/Frogger
update local a produccion
Update local rotrer
Merge branch 'master' of https://github.com/BowlMinions/Frogger

Conflicts:
	site/app/Controller/IntentosController.php
	site/app/Controller/PagesController.php
	site/app/View/Elements/footer.ctp
	site/app/webroot/js/main.js