almost first commit
Merge branch 'master' of github.com:zozzALive/afisha

Conflicts:
	.gitignore