Compilar para linux.
Saco los
Elimino todos los archivos de mas
Arreglo las dependencias de los archivos para usar el make autogenerado
Hago una copia de la carpeta para preservar por las dudas la configuracion del make que anda
Delete .cproject
Delete .project
Cambio polygon para que no aparezcan cosas raras en las imagenes
Formateo de codigo
Mergeo los cambios del remoto
Merge branch 'linux_compile' of github.com:demianLopez/taller into linux_compile
Reformateo el codigo
Cambiando organizacion proyecto para la logica del server
main.cpp conflict resolved
Arreglo conflicto
Agregados cambios de rutas
Merge branch 'master' into linux_compile

Conflicts:
	taller/common/polygons/Paralelogram.cpp
	taller/common/polygons/Polygon.cpp
	taller/game/SnowBross.cpp
	taller/game/SnowBross.h
	taller/game/engine/Game.cpp
	taller/game/engine/Game.h
	taller/server/Box2D/Collision/b2BroadPhase.cpp
	taller/server/Box2D/Collision/b2Collision.cpp
	taller/server/Box2D/Collision/b2TimeOfImpact.h
	taller/server/Box2D/Common/b2BlockAllocator.cpp
	taller/server/Box2D/Common/b2Draw.cpp
	taller/server/Box2D/Common/b2Draw.h
	taller/server/Box2D/Common/b2GrowableStack.h
	taller/server/Box2D/Common/b2Settings.cpp
	taller/server/Box2D/Common/b2StackAllocator.cpp
	taller/server/Box2D/Common/b2StackAllocator.h
	taller/server/Box2D/Common/b2Timer.cpp
	taller/server/Box2D/Common/b2Timer.h
	taller/server/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.cpp
	taller/server/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.h
	taller/server/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.cpp
	taller/server/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.h
	taller/server/Box2D/Dynamics/Contacts/b2CircleContact.cpp
	taller/server/Box2D/Dynamics/Contacts/b2CircleContact.h
	taller/server/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp
	taller/server/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.h
	taller/server/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp
	taller/server/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.h
	taller/server/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp
	taller/server/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.h
	taller/server/Box2D/Dynamics/Contacts/b2PolygonContact.cpp
	taller/server/Box2D/Dynamics/Contacts/b2PolygonContact.h
	taller/server/Box2D/Dynamics/Joints/b2Joint.cpp
	taller/server/Box2D/Dynamics/b2ContactManager.h
	taller/server/Box2D/Dynamics/b2Fixture.cpp
	taller/server/Box2D/Dynamics/b2Island.cpp
	taller/server/Box2D/Dynamics/b2TimeStep.h
	taller/server/Box2D/Dynamics/b2WorldCallbacks.cpp
	taller/server/Box2D/Rope/b2Rope.h
	taller/server/json/features.h
	taller/server/json/forwards.h
	taller/server/json/json_batchallocator.h
	taller/server/json/json_reader.cpp
	taller/server/json/json_value.cpp
	taller/server/json/json_writer.cpp
	taller/server/json/reader.h
	taller/server/json/value.h
	taller/server/json/writer.h
Merge pull request #2 from demianLopez/linux_compile

Linux compile