integration commit
Merge branch 'master' of https://github.com/asaenzestrada/jeopardy
~ Cambie la estructura del JSON para tener una jerarquia mejor organizada.
Merge branch 'master' of https://github.com/asaenzestrada/jeopardy

Conflicts:
	Assets/opciones.json
	Game.py