Delete subdir.mk
Delete subdir.mk
Delete subdir.mk
Delete subdir.mk
Delete subdir.mk
Delete subdir.mk
Delete subdir.mk
Delete .cproject
Delete .project
Delete .cproject
Delete .project
Agrego los cambios del branch Linux Compile
Merge branch 'linux_compile' into server-making
Agrego los cambios del branch master
Merge branch 'master' into server-making