ARCHIVO FIXTURE
Readme Fixtures
Merge branch '001/juan/fixtures' of github.com:ErickSanchez/JuegosNacionales into 001/juan/fixtures
eliminar Fixture.md
Merge branch 'master' into 001/juan/fixtures

Conflicts:
	README.md
fixtures
ultimo fixture
controladorfixture
controladorfixture
ficturesjuegos
fixtureevent
user
index
pruebas
ultimos
ultimocommit
correcciones fixtures
Merge pull request #1 from ErickSanchez/001/juan/fixtures

001/juan/fixtures