Cambio_Tablas_Game
Merge branch 'Prototipo2' of https://github.com/emma1993/Proyecto into Prototipo2

Conflicts:
	fill_table.php
	game_control_table_images.php
	submit_character.php