Capitulo 1 William
Merge branch 'master' of https://github.com/joruiru/2112

Conflicts:
	media/games/2112/2112.game.es.js