#repo
#
Merge branch 'master' of github.com:skor-ru/instamp3

Conflicts:
	.gitignore