mmerge
Merge branch 'master' of https://github.com/Fedecolangelo/TallerProgramacionI-Worms

Conflicts:
	WormsCS/source/model/figures/Circle.cpp
	WormsCS/source/model/players/Worm.cpp
+ cambios
+
Merge branch 'master' of https://github.com/Fedecolangelo/TallerProgramacionI-Worms

Conflicts:
	WormsCS/cliente+vista.vcxproj.filters