marshalling/unmarshalling
Merge branch 'master' of git@github.com:svenketr/DistributedSystems

Conflicts:

	lsp.h
resolved and merged