Contenido de define.h
Merge branch 'master' of https://github.com/metalriders/sockets
Merge branch 'master' of https://github.com/metalriders/sockets
Merge branch 'master' of https://github.com/metalriders/sockets

Conflicts:
	define.h
Merge branch 'master' of https://github.com/metalriders/sockets
Agregada libreria y archivo lib.c
Merge branch 'master' of https://github.com/metalriders/sockets
Merge branch 'rama1'