added basicServer
merged a file