finished my part
Merge remote-tracking branch 'origin'

Conflicts:
	cheatsheet/latexsheet.pdf