4to

Signed-off-by: Maxim Ikonnikov <lastick1@gmail.com>
Merge branch 'master' of github.com:lastick1/myrepository

Conflicts:
	about.txt