ADD
Merge branch 'master' of https://github.com/pahaz/testik

Conflicts:
	2.txt