partidojs deleted
Merge branch 'master' of https://github.com/yepesasecas/golazzos2 into merge
Merge branch 'merge'
sprint 11
sprint 11
sprint 11
sprint 11
sprint 11
sprint 11
sprint 11
Revert 93adf32..9153ebd

This rolls back to commit 93adf324449d453f3eba58fc8dcc5657a960ed44.
sprint 11