versión integrada
Merge branch 'master' of https://github.com/Fedecolangelo/TallerProgramacionI-Worms

Conflicts:
	WormsCS/source/clientModel/ModelClient.cpp
	WormsCS/source/clientModel/ModelClient.h
	WormsCS/source/clientModel/WormClient.cpp
	WormsCS/source/clientModel/WormClient.h
	WormsCS/source/communications/serializaciones/ActualizationClientDTO.cpp
	WormsCS/source/communications/serializaciones/ActualizationClientDTO.h
	WormsCS/source/controller/GameButtonController.cpp
	WormsCS/source/controller/GameController.cpp
	WormsCS/source/controller/GameController.h
	WormsCS/source/main/client/AplicacionCliente.cpp
	WormsCS/source/main/server/AplicacionServidor.cpp
	WormsCS/source/main/server/main.cpp
	WormsCS/source/model/GameModel.cpp
	WormsCS/source/model/Player.cpp
	WormsCS/source/view/GameView.cpp
	WormsCS/source/view/GameView.h
	WormsCS/source/view/View.h
	WormsCS/source/view/WormView.cpp
	WormsCS/source/view/WormView.h