x appendix
Merge remote-tracking branch 'origin/master'

Conflicts:
	partials/component-display-clients.tex
diagrams and client programs for mac os x and linux descripted
Merge pull request #3 from badeleux/master

44 pages