Flujo del juego (Gameplay)
Merge branch 'master' of https://github.com/PadawanSofware/Tiquicia

Conflicts:
	proyecto/gdd.md
Merge branch 'master' of https://github.com/PadawanSofware/Tiquicia