лд
Merge branch 'master' of github.com:BogdanKarpiak/BunnyPuzzle

Conflicts:
	.idea/workspace.xml
ж
Merge branch 'master' of github.com:BogdanKarpiak/BunnyPuzzle

Conflicts:
	.idea/workspace.xml