change ignore
delete whitespaces
Merge branch 'master' of github.com:yauheni-sidarenka/origin

Conflicts:
	.gitignore