Z:sharelatex--merging/cs

Merguji