Wi
Merge branch 'master' of github.com:jcarlos7121/Grupo-Players-Frontend

Conflicts:
	index.php
Merge branch 'master' of github.com:jcarlos7121/Grupo-Players-Frontend
M
Merge branch 'master' of github.com:jcarlos7121/Grupo-Players-Frontend