updates - minor
Merge branch 'master' of https://github.com/benring/final

Conflicts:
	client_ll/client_ll.o