Latest commit (Eddit)
21.10:18.31
Merge branch 'master' of https://github.com/haritonov/gallery-test

Conflicts:
	.idea/workspace.xml