Conclusion expanded, Client-server description started
Merge remote-tracking branch 'origin/master'

Conflicts:
	report/report.tex