modified:   bin/Debug/scom.exe
	deleted:    inc/nd.h
	modified:   inc/netdev.h
	modified:   scom.depend
	modified:   scom.layout
	modified:   src/main.c
	deleted:    src/nd.c
Merge https://github.com/skyatua/scom

Conflicts:
	src/main.c
modified:   .gitignore
	modified:   inc/includes.h
	modified:   scom.depend
	modified:   src/main.c
Merge https://github.com/skyatua/scom

Conflicts:
	src/main.c
	modified:   inc/includes.h
	modified:   scom.depend
	modified:   src/main.c
	modified:   src/main.c