some changes
Merge branch 'master' of https://github.com/Dmitrii-I/cheat

Conflicts:
	linux.txt