Updating cheat sheet.
Merge remote-tracking branch 'origin/master'

Conflicts:
	cheat_sheet.txt