radar con diferentes tipos de punto
Merge remote-tracking branch 'origin/master'

Conflicts:
	SubWar_Client/src/LogicLayer/SubWar_Client.java