Merge branch 'master' of https://github.com/clethrill/sys-dev

Conflicts:
	Nick's work/client.cpp
essgdf

dg