thema13
Merge branch 'master' of https://github.com/gavroche500/exam1

Conflicts:
	cheetsheet.txt