test
Merge branch 'master' of https://github.com/StupedStudents/Crypto

Conflicts:
	Исходник/text 1