testaaa
test Merge branch 'master' of https://github.com/kaz-igu/homework

Conflicts:
	.DS_Store
aaaaaa