xcvcx
Merge branch 'master' of https://github.com/edrachev/test

Conflicts:
	readme.txt.txt