Updated Clases of model to prepare it for the new GUI

improved logic of game and minor bug fixed.